USE_AUI build fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index e72cef992b77ce9cb45d7f5472faf33319d2d1d9..ae99b8b2cdcb19b53606275257b1e3c7d04d1e3b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2801,6 +2801,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/notebook.h \
        wx/ownerdrw.h \
        wx/paper.h \
        wx/notebook.h \
        wx/ownerdrw.h \
        wx/paper.h \

+       wx/pickerbase.h \

        wx/popupwin.h \
        wx/print.h \
        wx/printdlg.h \
        wx/popupwin.h \
        wx/print.h \
        wx/printdlg.h \


@@ -27110,6 +27111,7 @@ GENDIR   = $(WXDIR)/src/generic
 COMMDIR  = $(WXDIR)/src/common
 HTMLDIR  = $(WXDIR)/src/html
 RICHTEXTDIR = $(WXDIR)/src/richtext
 COMMDIR  = $(WXDIR)/src/common
 HTMLDIR  = $(WXDIR)/src/html
 RICHTEXTDIR = $(WXDIR)/src/richtext

+AUIDIR =   $(WXDIR)/src/aui

 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg


@@ -27253,6 +27255,7 @@ ALL_GUI_DIST: ALL_DIST
        mkdir $(DISTDIR)/include/wx/generic
        mkdir $(DISTDIR)/include/wx/html
        mkdir $(DISTDIR)/include/wx/richtext
        mkdir $(DISTDIR)/include/wx/generic
        mkdir $(DISTDIR)/include/wx/html
        mkdir $(DISTDIR)/include/wx/richtext

+       mkdir $(DISTDIR)/include/wx/aui

        mkdir $(DISTDIR)/include/wx/protocol
        mkdir $(DISTDIR)/include/wx/unix
        mkdir $(DISTDIR)/include/wx/xml
        mkdir $(DISTDIR)/include/wx/protocol
        mkdir $(DISTDIR)/include/wx/unix
        mkdir $(DISTDIR)/include/wx/xml


@@ -27262,6 +27265,7 @@ ALL_GUI_DIST: ALL_DIST
        $(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
        $(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
        $(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
        $(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
        $(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
        $(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext

+       $(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui

        $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
        $(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
        $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
        $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
        $(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
        $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc


@@ -27275,6 +27279,7 @@ ALL_GUI_DIST: ALL_DIST
        mkdir $(DISTDIR)/src/generic
        mkdir $(DISTDIR)/src/html
        mkdir $(DISTDIR)/src/richtext
        mkdir $(DISTDIR)/src/generic
        mkdir $(DISTDIR)/src/html
        mkdir $(DISTDIR)/src/richtext

+       mkdir $(DISTDIR)/src/aui

        mkdir $(DISTDIR)/src/$(TOOLKITDIR)
        mkdir $(DISTDIR)/src/png
        mkdir $(DISTDIR)/src/jpeg
        mkdir $(DISTDIR)/src/$(TOOLKITDIR)
        mkdir $(DISTDIR)/src/png
        mkdir $(DISTDIR)/src/jpeg


@@ -27292,6 +27297,7 @@ ALL_GUI_DIST: ALL_DIST
        $(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
        $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
        $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
        $(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
        $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
        $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext

+       $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui

        $(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
        $(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
        $(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
        $(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
        $(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
        $(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png


@@ -27318,6 +27324,7 @@ BASE_DIST: ALL_DIST
        mkdir $(DISTDIR)/include/wx/msw
        mkdir $(DISTDIR)/include/wx/html
        mkdir $(DISTDIR)/include/wx/richtext
        mkdir $(DISTDIR)/include/wx/msw
        mkdir $(DISTDIR)/include/wx/html
        mkdir $(DISTDIR)/include/wx/richtext

+       mkdir $(DISTDIR)/include/wx/aui

        mkdir $(DISTDIR)/include/wx/mac
        mkdir $(DISTDIR)/include/wx/mac/carbon
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        mkdir $(DISTDIR)/include/wx/mac
        mkdir $(DISTDIR)/include/wx/mac/carbon
        mkdir $(DISTDIR)/include/wx/mac/corefoundation


@@ -28001,6 +28008,10 @@ SAMPLES_DIST: ALL_GUI_DIST
        $(CP_P) $(SAMPDIR)/richtext/readme.txt $(DISTDIR)/samples/richtext
        $(CP_P) $(SAMPDIR)/richtext/todo.txt $(DISTDIR)/samples/richtext
 
        $(CP_P) $(SAMPDIR)/richtext/readme.txt $(DISTDIR)/samples/richtext
        $(CP_P) $(SAMPDIR)/richtext/todo.txt $(DISTDIR)/samples/richtext
 

+       mkdir $(DISTDIR)/samples/aui
+       $(CP_P) $(SAMPDIR)/aui/Makefile.in $(DISTDIR)/samples/aui
+       $(CP_P) $(SAMPDIR)/aui/*.cpp $(DISTDIR)/samples/aui
+

        mkdir $(DISTDIR)/samples/propsize
        $(CP_P) $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
        $(CP_P) $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize
        mkdir $(DISTDIR)/samples/propsize
        $(CP_P) $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
        $(CP_P) $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 726c3b427f77f7cc19801f06dd0c13ef1017f34c..1822ce61842c874e196dee709d5e69872d7ef131 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -419,8 +419,9 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
     <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>

+        <set var="USE_AUI">1</set>

         <set var="USE_HTML">1</set>
         <set var="USE_HTML">1</set>

-         <set var="USE_MEDIA">1</set>
+        <set var="USE_MEDIA">1</set>

         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
         <set var="USE_ODBC">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
         <set var="USE_ODBC">1</set>

diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index ccd50dbfaabece656242c8ce87acb2e6699022ac..035f26028fc8bb79f2f2581685fecbeb07097e65 100644 (file)
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=adv - Win32 Debug USE_AUI_0
+CFG=adv - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=adv - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_adv.mak" CFG="adv - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_adv.mak" CFG="adv - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "adv - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "adv - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "adv - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "adv - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "adv - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=adv - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\adv"
-# 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_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_adv_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_ADV" /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_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_adv_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_ADV" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_adv_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_ADV
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_adv_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_ADV
-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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
 
 # 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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_adv.lib"
 

-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\adv"
-# 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_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_adv_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_ADV" /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_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_adv_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_ADV" /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_ADV" /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_ADV" /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_adv_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_ADV
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_adv_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_ADV
-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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
 
 # 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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_adv.lib" /debug
 

-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\adv"
-# 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_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_adv_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_ADV" /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_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_adv_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_ADV" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_adv_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_ADV
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_adv_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_ADV
-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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_adv.lib"
 

-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\adv"
-# 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_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_adv_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_ADV" /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_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_adv_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_ADV" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /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_adv_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_ADV
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_adv_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_ADV
-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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_adv.lib" /debug
 

-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\adv"
-# 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_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_adv_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_ADV" /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_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_adv_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_ADV" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_adv_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_ADV
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_adv_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_ADV
-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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
 
 # 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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_adv.lib"
 

-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\adv"
-# 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_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_adv_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_ADV" /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_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_adv_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_ADV" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /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_adv_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_ADV
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_adv_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_ADV
-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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
 
 # 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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_adv.lib" /debug
 

-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\adv"
-# 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_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw270_adv_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_ADV" /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_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw270_adv_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_ADV" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_adv_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_ADV
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_adv_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_ADV
-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\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.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\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.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\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.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\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.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\wxmsw27_html.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_adv.lib"
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\adv"
-# 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_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_adv_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_ADV" /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_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_adv_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_ADV" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_adv_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_ADV
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_adv_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_ADV
-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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_adv.lib" /debug
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,245 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\adv"
+# PROP BASE Intermediate_Dir "vc_mswunivud\adv"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\adv"
+# PROP Intermediate_Dir "vc_mswunivud\adv"

 # PROP Target_Dir ""
 # 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.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" /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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.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" /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 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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_adv.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_adv.lib"

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\adv"
+# PROP BASE Intermediate_Dir "vc_mswuniv\adv"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\adv"
+# PROP Intermediate_Dir "vc_mswuniv\adv"

 # PROP Target_Dir ""
 # 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.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" /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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.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" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.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__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.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__" /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 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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_adv.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_adv.lib"

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"

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

-# PROP BASE Intermediate_Dir "vc_mswunivud\adv"
+# PROP BASE Intermediate_Dir "vc_mswunivd\adv"

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

-# PROP Intermediate_Dir "vc_mswunivud\adv"
+# PROP Intermediate_Dir "vc_mswunivd\adv"

 # PROP Target_Dir ""
 # 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.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" /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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.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__" /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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.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__" /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 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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_adv.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_adv.lib"

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"

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

-# PROP BASE Intermediate_Dir "vc_mswuniv\adv"
+# PROP BASE Intermediate_Dir "vc_mswu\adv"

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

-# PROP Intermediate_Dir "vc_mswuniv\adv"
+# PROP Intermediate_Dir "vc_mswu\adv"

 # PROP Target_Dir ""
 # 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.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__" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.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" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.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" /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 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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_adv.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_adv.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_adv.lib"

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\adv"
+# PROP BASE Intermediate_Dir "vc_mswud\adv"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\adv"
-# 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.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__" /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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\adv"
-# 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.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__" /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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.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__" /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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\adv"
-# 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.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__" /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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.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__" /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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\adv"
-# 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.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" /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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\adv"
-# 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.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" /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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - 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\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\adv"
-# 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.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" /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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.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" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\adv"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\adv"
 # PROP Target_Dir ""


@@ -735,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_adv.lib"
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\adv"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.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__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -781,30 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_adv.lib"
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\adv"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\adv"
-# 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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.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__" /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_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.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__" /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_adv.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_adv.lib"
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "adv - Win32 DLL Universal Release USE_AUI_1"
-# Name "adv - Win32 DLL Universal Release USE_AUI_0"
-# Name "adv - Win32 DLL Universal Debug USE_AUI_1"
-# Name "adv - Win32 DLL Universal Debug USE_AUI_0"
-# Name "adv - Win32 DLL Unicode Release USE_AUI_1"
-# Name "adv - Win32 DLL Unicode Release USE_AUI_0"
-# Name "adv - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "adv - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "adv - Win32 DLL Release USE_AUI_1"
-# Name "adv - Win32 DLL Release USE_AUI_0"
-# Name "adv - Win32 DLL Debug USE_AUI_1"
-# Name "adv - Win32 DLL Debug USE_AUI_0"
-# Name "adv - Win32 Universal Unicode Release USE_AUI_1"
-# Name "adv - Win32 Universal Unicode Release USE_AUI_0"
-# Name "adv - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "adv - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "adv - Win32 Universal Release USE_AUI_1"
-# Name "adv - Win32 Universal Release USE_AUI_0"
-# Name "adv - Win32 Universal Debug USE_AUI_1"
-# Name "adv - Win32 Universal Debug USE_AUI_0"
-# Name "adv - Win32 Unicode Release USE_AUI_1"
-# Name "adv - Win32 Unicode Release USE_AUI_0"
-# Name "adv - Win32 Unicode Debug USE_AUI_1"
-# Name "adv - Win32 Unicode Debug USE_AUI_0"
-# Name "adv - Win32 Release USE_AUI_1"
-# Name "adv - Win32 Release USE_AUI_0"
-# Name "adv - Win32 Debug USE_AUI_1"
-# Name "adv - Win32 Debug USE_AUI_0"
+# Name "adv - Win32 DLL Universal Unicode Release"
+# Name "adv - Win32 DLL Universal Unicode Debug"
+# Name "adv - Win32 DLL Universal Release"
+# Name "adv - Win32 DLL Universal Debug"
+# Name "adv - Win32 DLL Unicode Release"
+# Name "adv - Win32 DLL Unicode Debug"
+# Name "adv - Win32 DLL Release"
+# Name "adv - Win32 DLL Debug"
+# Name "adv - Win32 Universal Unicode Release"
+# Name "adv - Win32 Universal Unicode Debug"
+# Name "adv - Win32 Universal Release"
+# Name "adv - Win32 Universal Debug"
+# Name "adv - Win32 Unicode Release"
+# Name "adv - Win32 Unicode Debug"
+# Name "adv - Win32 Release"
+# Name "adv - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -888,116 +472,60 @@ SOURCE=..\..\src\common\taskbarcmn.cpp
 
 SOURCE=..\..\src\msw\datectrl.cpp
 
 
 SOURCE=..\..\src\msw\datectrl.cpp
 

-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"

 
 

-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
-
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"

 
 

+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_1"

 
 

+!ELSEIF  "$(CFG)" == "adv - Win32 Release"

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_0"

 
 

-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"

 
 
 !ENDIF
 
 
 !ENDIF


@@ -1019,115 +547,59 @@ SOURCE=..\..\src\msw\taskbar.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1206,7 +678,7 @@ SOURCE=..\..\src\generic\wizard.cpp
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1216,27 +688,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1246,7 +698,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1256,278 +708,136 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - 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)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - 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)" == "adv - 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)" == "adv - 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)" == "adv - 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)" == "adv - 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)" == "adv - 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)" == "adv - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-# Begin Custom Build - 
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-SOURCE=..\..\include\wx\msw\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build

 
 

-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
+!ENDIF

 
 

-# Begin Custom Build - 
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\include\wx\msw\setup.h

 
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"

 
 

-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1537,17 +847,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"

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


@@ -1557,17 +857,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1577,17 +867,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1597,65 +877,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"

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


@@ -1665,17 +911,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1685,17 +921,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1705,17 +931,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1740,7 +956,7 @@ SOURCE=..\..\include\wx\msw\datectrl.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1749,25 +965,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1776,7 +974,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1785,25 +983,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1812,7 +992,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1821,25 +1001,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1848,7 +1010,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1857,25 +1019,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1884,7 +1028,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1893,25 +1037,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1920,7 +1046,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1929,25 +1055,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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)" == "adv - 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)" == "adv - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1956,7 +1064,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1965,25 +1073,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - 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
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1992,7 +1082,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -2001,25 +1091,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "adv - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_aui.dsp b/build/msw/wx_aui.dsp
index ad8fdfb2e1fe25cf088b31a0b7f4c61fa128dde8..4d95305ca687bedac1fa594234f533fdc0d5293f 100644 (file)
--- a/build/msw/wx_aui.dsp
+++ b/build/msw/wx_aui.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=aui - Win32 Debug USE_AUI_1
+CFG=aui - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,26 +14,26 @@ CFG=aui - Win32 Debug USE_AUI_1
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !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_aui.mak" CFG="aui - Win32 Debug USE_AUI_1"
+!MESSAGE NMAKE /f "wx_aui.mak" CFG="aui - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "aui - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "aui - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "aui - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "aui - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "aui - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "aui - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "aui - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "aui - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "aui - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "aui - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "aui - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "aui - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "aui - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "aui - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "aui - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "aui - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
+!MESSAGE "aui - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aui - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aui - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aui - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aui - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aui - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aui - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aui - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "aui - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "aui - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "aui - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "aui - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "aui - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "aui - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "aui - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "aui - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -43,7 +43,7 @@ CFG=aui - Win32 Debug USE_AUI_1
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -68,7 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_aui.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\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_aui.lib"
 
 # 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\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_aui.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\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -93,7 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_aui.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\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_aui.lib" /debug
 
 # 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\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_aui.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\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_aui.lib" /debug
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -118,7 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_aui.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\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_aui.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\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_aui.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\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -143,7 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_aui.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\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_aui.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\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_aui.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\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_aui.lib" /debug
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -168,7 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_aui.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\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_aui.lib"
 
 # 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\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_aui.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\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -193,7 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_aui.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\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_aui.lib" /debug
 
 # 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\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_aui.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\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_aui.lib" /debug
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -218,7 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_aui.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\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_aui.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\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_aui.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\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -243,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_aui.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\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_aui.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\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_aui.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\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_aui.lib" /debug
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -266,7 +266,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_aui.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -289,7 +289,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_aui.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -312,7 +312,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_aui.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -335,7 +335,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_aui.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -358,7 +358,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_aui.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -381,7 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_aui.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -404,7 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_aui.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_aui.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_aui.lib"
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -431,22 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "aui - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "aui - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "aui - Win32 DLL Universal Release USE_AUI_1"
-# Name "aui - Win32 DLL Universal Debug USE_AUI_1"
-# Name "aui - Win32 DLL Unicode Release USE_AUI_1"
-# Name "aui - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "aui - Win32 DLL Release USE_AUI_1"
-# Name "aui - Win32 DLL Debug USE_AUI_1"
-# Name "aui - Win32 Universal Unicode Release USE_AUI_1"
-# Name "aui - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "aui - Win32 Universal Release USE_AUI_1"
-# Name "aui - Win32 Universal Debug USE_AUI_1"
-# Name "aui - Win32 Unicode Release USE_AUI_1"
-# Name "aui - Win32 Unicode Debug USE_AUI_1"
-# Name "aui - Win32 Release USE_AUI_1"
-# Name "aui - Win32 Debug USE_AUI_1"
+# Name "aui - Win32 DLL Universal Unicode Release"
+# Name "aui - Win32 DLL Universal Unicode Debug"
+# Name "aui - Win32 DLL Universal Release"
+# Name "aui - Win32 DLL Universal Debug"
+# Name "aui - Win32 DLL Unicode Release"
+# Name "aui - Win32 DLL Unicode Debug"
+# Name "aui - Win32 DLL Release"
+# Name "aui - Win32 DLL Debug"
+# Name "aui - Win32 Universal Unicode Release"
+# Name "aui - Win32 Universal Unicode Debug"
+# Name "aui - Win32 Universal Release"
+# Name "aui - Win32 Universal Debug"
+# Name "aui - Win32 Unicode Release"
+# Name "aui - Win32 Unicode Debug"
+# Name "aui - Win32 Release"
+# Name "aui - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -464,59 +464,59 @@ SOURCE=..\..\src\common\dummy.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -531,7 +531,7 @@ SOURCE=..\..\src\msw\version.rc
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -541,7 +541,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -551,7 +551,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -561,7 +561,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -571,31 +571,31 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -605,7 +605,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -615,7 +615,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -625,7 +625,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -635,25 +635,25 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Debug"

 
 # Begin Custom Build - 
 
 
 # Begin Custom Build - 
 


@@ -666,31 +666,31 @@ InputPath=..\include\wx\univ\setup.h
 
 SOURCE=..\..\include\wx\msw\setup.h
 
 
 SOURCE=..\..\include\wx\msw\setup.h
 

-!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -700,7 +700,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug"

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


@@ -710,7 +710,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -720,7 +720,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -730,31 +730,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release"

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


@@ -764,7 +764,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -774,7 +774,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -784,7 +784,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -805,7 +805,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -814,7 +814,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -823,7 +823,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -832,7 +832,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -841,7 +841,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -850,7 +850,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -859,7 +859,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -868,7 +868,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -877,7 +877,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -886,7 +886,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -895,7 +895,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -904,7 +904,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -913,7 +913,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -922,7 +922,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -931,7 +931,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -940,7 +940,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "aui - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "aui - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 69745ac529f425a75639a8f44fdbb22df9d89a03..daa5a2287ce7f9e46e7ae0659a025a06d6b2bfc9 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=base - Win32 Debug USE_AUI_0
+CFG=base - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=base - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_base.mak" CFG="base - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_base.mak" CFG="base - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "base - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "base - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "base - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "base - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "base - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,7 +43,7 @@ CFG=base - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -84,57 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\base"
-# 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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
-
-!ELSEIF  "$(CFG)" == "base - 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\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\base"
-# 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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase270ud_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,7 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -184,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\base"
-# 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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -234,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal 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_mswunivddll\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\base"
-# 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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -284,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\base"
-# 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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u.lib"
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -334,57 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode 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_mswuddll\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\base"
-# 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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud.lib" /debug
-
-!ELSEIF  "$(CFG)" == "base - 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\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\base"
-# 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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase270_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,7 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27.lib"
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -434,55 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 
 # ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 # ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
 

-!ELSEIF  "$(CFG)" == "base - 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\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\base"
-# 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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase270d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d.lib" /debug
-
-!ELSEIF  "$(CFG)" == "base - 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\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\base"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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\wxbase27u.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
-
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -490,229 +251,114 @@ LIB32=link.exe -lib
 # PROP BASE Intermediate_Dir "vc_mswunivu\base"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Intermediate_Dir "vc_mswunivu\base"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\base"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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\wxbase27u.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
-
-!ELSEIF  "$(CFG)" == "base - 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\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\base"
-# 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\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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\wxbase27ud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
-
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\base"
-# 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\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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\wxbase27ud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
-
-!ELSEIF  "$(CFG)" == "base - 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\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\base"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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\wxbase27.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
-
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\base"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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\wxbase27.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
-
-!ELSEIF  "$(CFG)" == "base - 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\base"
-# 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivd\base"
+# PROP Intermediate_Dir "vc_mswunivu\base"

 # PROP Target_Dir ""
 # 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\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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 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\wxbase27d.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"

 
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"

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

-# PROP BASE Intermediate_Dir "vc_mswunivd\base"
+# PROP BASE Intermediate_Dir "vc_mswunivud\base"

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

-# PROP Intermediate_Dir "vc_mswunivd\base"
+# PROP Intermediate_Dir "vc_mswunivud\base"

 # PROP Target_Dir ""
 # 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\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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 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\wxbase27d.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"

 
 

-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Release"

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

-# PROP BASE Intermediate_Dir "vc_mswu\base"
+# PROP BASE Intermediate_Dir "vc_mswuniv\base"

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

-# PROP Intermediate_Dir "vc_mswu\base"
+# PROP Intermediate_Dir "vc_mswuniv\base"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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 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\wxbase27u.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"

 
 

-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswu\base"
+# PROP BASE Intermediate_Dir "vc_mswunivd\base"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswu\base"
+# PROP Intermediate_Dir "vc_mswunivd\base"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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 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\wxbase27u.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"

 
 

-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswud\base"
+# PROP BASE Intermediate_Dir "vc_mswu\base"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswud\base"
+# PROP Intermediate_Dir "vc_mswu\base"

 # PROP Target_Dir ""
 # 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\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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 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\wxbase27ud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u.lib"

 
 

-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -735,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud.lib"
 

-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\base"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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\wxbase27.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
-
-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -781,30 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27.lib"
 

-!ELSEIF  "$(CFG)" == "base - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\base"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\base"
-# 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\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.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_GUI=0 /D wxUSE_BASE=1 /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\wxbase27d.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d.lib"
-
-!ELSEIF  "$(CFG)" == "base - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "base - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "base - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "base - Win32 DLL Universal Release USE_AUI_1"
-# Name "base - Win32 DLL Universal Release USE_AUI_0"
-# Name "base - Win32 DLL Universal Debug USE_AUI_1"
-# Name "base - Win32 DLL Universal Debug USE_AUI_0"
-# Name "base - Win32 DLL Unicode Release USE_AUI_1"
-# Name "base - Win32 DLL Unicode Release USE_AUI_0"
-# Name "base - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "base - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "base - Win32 DLL Release USE_AUI_1"
-# Name "base - Win32 DLL Release USE_AUI_0"
-# Name "base - Win32 DLL Debug USE_AUI_1"
-# Name "base - Win32 DLL Debug USE_AUI_0"
-# Name "base - Win32 Universal Unicode Release USE_AUI_1"
-# Name "base - Win32 Universal Unicode Release USE_AUI_0"
-# Name "base - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "base - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "base - Win32 Universal Release USE_AUI_1"
-# Name "base - Win32 Universal Release USE_AUI_0"
-# Name "base - Win32 Universal Debug USE_AUI_1"
-# Name "base - Win32 Universal Debug USE_AUI_0"
-# Name "base - Win32 Unicode Release USE_AUI_1"
-# Name "base - Win32 Unicode Release USE_AUI_0"
-# Name "base - Win32 Unicode Debug USE_AUI_1"
-# Name "base - Win32 Unicode Debug USE_AUI_0"
-# Name "base - Win32 Release USE_AUI_1"
-# Name "base - Win32 Release USE_AUI_0"
-# Name "base - Win32 Debug USE_AUI_1"
-# Name "base - Win32 Debug USE_AUI_0"
+# Name "base - Win32 DLL Universal Unicode Release"
+# Name "base - Win32 DLL Universal Unicode Debug"
+# Name "base - Win32 DLL Universal Release"
+# Name "base - Win32 DLL Universal Debug"
+# Name "base - Win32 DLL Unicode Release"
+# Name "base - Win32 DLL Unicode Debug"
+# Name "base - Win32 DLL Release"
+# Name "base - Win32 DLL Debug"
+# Name "base - Win32 Universal Unicode Release"
+# Name "base - Win32 Universal Unicode Debug"
+# Name "base - Win32 Universal Release"
+# Name "base - Win32 Universal Debug"
+# Name "base - Win32 Unicode Release"
+# Name "base - Win32 Unicode Debug"
+# Name "base - Win32 Release"
+# Name "base - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -1197,115 +781,59 @@ SOURCE=..\..\src\msw\utilsexc.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "base - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "base - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1324,65 +852,31 @@ SOURCE=..\..\src\msw\volume.cpp
 
 SOURCE=..\..\include\wx\msw\setup.h
 
 
 SOURCE=..\..\include\wx\msw\setup.h
 

-!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1392,17 +886,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"

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


@@ -1412,17 +896,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1432,17 +906,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1452,105 +916,51 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 
 # 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)" == "base - 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)" == "base - 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
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h

 InputPath=..\include\wx\msw\setup.h
 
 InputPath=..\include\wx\msw\setup.h
 

-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1560,17 +970,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1587,7 +987,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1597,27 +997,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1627,17 +1007,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1647,17 +1017,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1667,65 +1027,31 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1735,17 +1061,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1755,17 +1071,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1775,17 +1081,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1795,49 +1091,25 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Debug"

 
 # Begin Custom Build - 
 
 
 # Begin Custom Build - 
 


@@ -1882,7 +1154,7 @@ SOURCE=..\..\include\wx\msw\gccpriv.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1891,25 +1163,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1918,7 +1172,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1927,25 +1181,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1954,7 +1190,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1963,25 +1199,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1990,7 +1208,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1999,25 +1217,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -2026,7 +1226,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -2035,25 +1235,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -2062,7 +1244,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -2071,25 +1253,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -2098,7 +1262,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -2107,25 +1271,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - 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
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -2134,7 +1280,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "base - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -2143,25 +1289,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "base - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "base - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "base - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 168712f0ffc1609abcb5ff7ff486c903db33d522..3142ed8738145a27f70252029161c0c12ec67bfa 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=core - Win32 Debug USE_AUI_0
+CFG=core - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=core - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 

-!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "core - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=core - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
 
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
 
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
 
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
 
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
 
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
 
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
 
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
 # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
 
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
 # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,245 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
 

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

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\core"
+# PROP BASE Intermediate_Dir "vc_mswunivud\core"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\core"
+# PROP Intermediate_Dir "vc_mswunivud\core"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"

 
 

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

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Use_Debug_Libraries 0

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\core"
+# PROP BASE Intermediate_Dir "vc_mswuniv\core"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 0

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\core"
+# PROP Intermediate_Dir "vc_mswuniv\core"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"

 
 

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

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

-# PROP BASE Intermediate_Dir "vc_mswunivud\core"
+# PROP BASE Intermediate_Dir "vc_mswunivd\core"

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

-# PROP Intermediate_Dir "vc_mswunivud\core"
+# PROP Intermediate_Dir "vc_mswunivd\core"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"

 
 

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

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

-# PROP BASE Intermediate_Dir "vc_mswuniv\core"
+# PROP BASE Intermediate_Dir "vc_mswu\core"

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

-# PROP Intermediate_Dir "vc_mswuniv\core"
+# PROP Intermediate_Dir "vc_mswu\core"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"

 
 

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

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\core"
+# PROP BASE Intermediate_Dir "vc_mswud\core"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\core"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\core"
 # PROP Target_Dir ""


@@ -735,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -781,30 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
 

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

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "core - Win32 DLL Universal Release USE_AUI_1"
-# Name "core - Win32 DLL Universal Release USE_AUI_0"
-# Name "core - Win32 DLL Universal Debug USE_AUI_1"
-# Name "core - Win32 DLL Universal Debug USE_AUI_0"
-# Name "core - Win32 DLL Unicode Release USE_AUI_1"
-# Name "core - Win32 DLL Unicode Release USE_AUI_0"
-# Name "core - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "core - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "core - Win32 DLL Release USE_AUI_1"
-# Name "core - Win32 DLL Release USE_AUI_0"
-# Name "core - Win32 DLL Debug USE_AUI_1"
-# Name "core - Win32 DLL Debug USE_AUI_0"
-# Name "core - Win32 Universal Unicode Release USE_AUI_1"
-# Name "core - Win32 Universal Unicode Release USE_AUI_0"
-# Name "core - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "core - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "core - Win32 Universal Release USE_AUI_1"
-# Name "core - Win32 Universal Release USE_AUI_0"
-# Name "core - Win32 Universal Debug USE_AUI_1"
-# Name "core - Win32 Universal Debug USE_AUI_0"
-# Name "core - Win32 Unicode Release USE_AUI_1"
-# Name "core - Win32 Unicode Release USE_AUI_0"
-# Name "core - Win32 Unicode Debug USE_AUI_1"
-# Name "core - Win32 Unicode Debug USE_AUI_0"
-# Name "core - Win32 Release USE_AUI_1"
-# Name "core - Win32 Release USE_AUI_0"
-# Name "core - Win32 Debug USE_AUI_1"
-# Name "core - Win32 Debug USE_AUI_0"
+# Name "core - Win32 DLL Universal Unicode Release"
+# Name "core - Win32 DLL Universal Unicode Debug"
+# Name "core - Win32 DLL Universal Release"
+# Name "core - Win32 DLL Universal Debug"
+# Name "core - Win32 DLL Unicode Release"
+# Name "core - Win32 DLL Unicode Debug"
+# Name "core - Win32 DLL Release"
+# Name "core - Win32 DLL Debug"
+# Name "core - Win32 Universal Unicode Release"
+# Name "core - Win32 Universal Unicode Debug"
+# Name "core - Win32 Universal Release"
+# Name "core - Win32 Universal Debug"
+# Name "core - Win32 Unicode Release"
+# Name "core - Win32 Unicode Debug"
+# Name "core - Win32 Release"
+# Name "core - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -1224,116 +808,123 @@ SOURCE=..\..\src\common\xpmdecod.cpp
 
 SOURCE=..\..\src\msw\accel.cpp
 
 
 SOURCE=..\..\src\msw\accel.cpp
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

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

 
 

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

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+# PROP Exclude_From_Build 1

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"

 
 

+!ENDIF

 
 

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

 
 

+SOURCE=..\..\src\msw\ole\access.cpp

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 
 
 

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

 
 
 !ENDIF
 
 
 !ENDIF


@@ -1341,118 +932,141 @@ SOURCE=..\..\src\msw\accel.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\ole\access.cpp
+SOURCE=..\..\src\msw\app.cpp
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\ole\automtn.cpp
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\bitmap.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\msw\bmpbuttn.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

+# End Source File
+# Begin Source File

 
 

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

 
 

+SOURCE=..\..\src\msw\button.cpp

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 
 
 

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

 
 
 !ENDIF
 
 
 !ENDIF


@@ -1460,7082 +1074,1178 @@ SOURCE=..\..\src\msw\ole\access.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\app.cpp
+SOURCE=..\..\src\msw\caret.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checkbox.cpp

 
 

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

 
 

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

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\checklst.cpp

 
 

-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\brush.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\button.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\caret.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\checkbox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\checklst.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\choice.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\colordlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\colour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\combo.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\combobox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\control.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\cursor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\data.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcclient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcmemory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcprint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcscreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dialog.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dialup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dirdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\display.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dragimag.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\enhmeta.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\evtloop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fdrepdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\filedlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\font.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontenum.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontutil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\frame.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gauge95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gdiimage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gdiobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gsockmsw.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\helpchm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\helpwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\icon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\imaglist.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\iniconf.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\listbox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\listctrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\mdi.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\menu.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\menuitem.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\metafile.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\minifram.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\msgdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\mslu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\nativdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\notebook.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ownerdrw.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\palette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\pen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\popupwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\printdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\printwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\radiobox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\radiobut.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\region.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\renderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\scrolbar.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\settings.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\slider95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\spinbutt.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\spinctrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\statbmp.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\statbox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\statbr95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\statline.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\stattext.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tabctrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tbar95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\textctrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tglbtn.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\timer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tooltip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\toplevel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\treectrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\utilsgui.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\uuid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\uxtheme.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\volume.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\window.cpp
-# End Source File
-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\generic\accel.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\busyinfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\buttonbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\choicbkg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\choicdgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\clrpickerg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\colrdlgg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\combog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dcpsg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirctrlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirdlgg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dragimgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\fdrepdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\choice.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\filedlgg.cpp
+SOURCE=..\..\src\msw\clipbrd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\colordlg.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\msw\colour.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\combo.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\generic\filepickerg.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF
+

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\fontdlgg.cpp
+SOURCE=..\..\src\msw\combobox.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\control.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\fontpickerg.cpp
+SOURCE=..\..\src\msw\cursor.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\imaglist.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\data.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

+SOURCE=..\..\src\msw\dialog.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

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

 
 

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

 
 

+SOURCE=..\..\src\msw\dirdlg.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 !ENDIF
 
 # End Source File
 # Begin Source File
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\listbkg.cpp
+SOURCE=..\..\src\msw\display.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\listctrl.cpp
+SOURCE=..\..\src\msw\dragimag.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\enhmeta.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\evtloop.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\fdrepdlg.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\logg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\mdig.cpp
+SOURCE=..\..\src\msw\filedlg.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\font.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\fontdlg.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\msgdlgg.cpp
+SOURCE=..\..\src\msw\fontenum.cpp
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\fontutil.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\frame.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"

 
 

+!ENDIF

 
 

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

 
 

+SOURCE=..\..\src\msw\gauge95.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\generic\numdlgg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-SOURCE=..\..\src\generic\panelg.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\generic\printps.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF

 
 

-SOURCE=..\..\src\generic\prntdlgg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\progdlgg.cpp
+SOURCE=..\..\src\msw\gdiimage.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\renderg.cpp
+SOURCE=..\..\src\msw\gdiobj.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\scrlwing.cpp
+SOURCE=..\..\src\msw\gsockmsw.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\selstore.cpp
+SOURCE=..\..\src\msw\helpchm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\spinctlg.cpp
+SOURCE=..\..\src\msw\helpwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\splitter.cpp
+SOURCE=..\..\src\msw\icon.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\statusbr.cpp
+SOURCE=..\..\src\msw\imaglist.cpp

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

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

 
 

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

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+# PROP Exclude_From_Build 1

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"

 
 

+!ENDIF

 
 

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

 
 

+SOURCE=..\..\src\msw\iniconf.cpp

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 
 
 

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

 
 
 !ENDIF
 
 
 !ENDIF


@@ -8543,1696 +2253,1771 @@ SOURCE=..\..\src\generic\statusbr.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\tabg.cpp
+SOURCE=..\..\src\msw\listbox.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

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

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"

 
 

+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\listctrl.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 

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

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-!ENDIF

 
 

-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-SOURCE=..\..\src\generic\textdlgg.cpp
-# End Source File
-# Begin Source File

 
 

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

 
 

-SOURCE=..\..\src\generic\toolbkg.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\generic\treebkg.cpp
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\src\generic\treectlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\vlbox.cpp
+SOURCE=..\..\src\msw\main.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\vscroll.cpp
-# End Source File
-# End Group
-# Begin Group "wxUniv Sources"
+SOURCE=..\..\src\msw\mdi.cpp

 
 

-# PROP Default_Filter ""
-# Begin Source File
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\src\univ\bmpbuttn.cpp
+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\menu.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\button.cpp
+SOURCE=..\..\src\msw\menuitem.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

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

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"

 
 

+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\metafile.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-!ENDIF

 
 

-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-SOURCE=..\..\src\univ\checkbox.cpp

 
 

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

 
 
 
 

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

 
 

+# End Source File
+# Begin Source File

 
 

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

 
 

+SOURCE=..\..\src\msw\msgdlg.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ENDIF

 
 

+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+SOURCE=..\..\src\msw\mslu.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\nativdlg.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\univ\checklst.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"

 
 

+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\notebook.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ENDIF

 
 

+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+SOURCE=..\..\src\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\ownerdrw.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-SOURCE=..\..\src\univ\choice.cpp
+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ENDIF

 
 

+# End Source File
+# Begin Source File

 
 

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

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\popupwin.cpp
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\printdlg.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+SOURCE=..\..\src\msw\printwin.cpp
+# End Source File
+# Begin Source File

 
 

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

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+# PROP Exclude_From_Build 1

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+# PROP Exclude_From_Build 1

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+# PROP Exclude_From_Build 1

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+# PROP Exclude_From_Build 1

 
 

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

 
 

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

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"

 
 

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

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"

 
 

-# PROP Exclude_From_Build 1
+!ENDIF

 
 

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

 
 

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

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\univ\colschem.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File

 
 

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

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\renderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\scrolbar.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\combobox.cpp
+SOURCE=..\..\src\msw\settings.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\slider95.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\spinbutt.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\control.cpp
+SOURCE=..\..\src\msw\spinctrl.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\statbmp.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\ctrlrend.cpp
+SOURCE=..\..\src\msw\statbox.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\statbr95.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\dialog.cpp
+SOURCE=..\..\src\msw\statline.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\stattext.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\framuniv.cpp
+SOURCE=..\..\src\msw\tabctrl.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\tbar95.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\gauge.cpp
+SOURCE=..\..\src\msw\textctrl.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\tglbtn.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\gtk.cpp
+SOURCE=..\..\src\msw\timer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\tooltip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\toplevel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\treectrl.cpp

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\utilsgui.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\uxtheme.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\version.rc
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -10241,117 +4026,156 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\inpcons.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\volume.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\msw\window.cpp
+# End Source File
+# End Group
+# Begin Group "Generic Sources"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+# PROP Default_Filter ""
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\accel.cpp

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\busyinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\buttonbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\choicbkg.cpp
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\generic\choicdgg.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\clrpickerg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\colrdlgg.cpp

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -10360,117 +4184,140 @@ SOURCE=..\..\src\univ\inpcons.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\inphand.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\combog.cpp
+# End Source File
+# Begin Source File

 
 

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

 
 

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

 
 

+SOURCE=..\..\src\generic\dirdlgg.cpp

 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 
 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 

+# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 

-# PROP Exclude_From_Build 1

 
 

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

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ENDIF

 
 

+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+SOURCE=..\..\src\generic\dragimgg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\fdrepdlg.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -10479,117 +4326,128 @@ SOURCE=..\..\src\univ\inphand.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\listbox.cpp
+SOURCE=..\..\src\generic\filedlgg.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF

 
 

+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\generic\filepickerg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\fontdlgg.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -10598,117 +4456,132 @@ SOURCE=..\..\src\univ\listbox.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\menu.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\fontpickerg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\imaglist.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ENDIF

 
 

+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+SOURCE=..\..\src\generic\listbkg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\listctrl.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -10717,117 +4590,128 @@ SOURCE=..\..\src\univ\menu.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\metal.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\logg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\mdig.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# PROP Exclude_From_Build 1

 
 

+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\msgdlgg.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -10836,117 +4720,164 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\notebook.cpp
+SOURCE=..\..\src\generic\numdlgg.cpp
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\panelg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\printps.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\generic\prntdlgg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\progdlgg.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+SOURCE=..\..\src\generic\renderg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\scrlwing.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+SOURCE=..\..\src\generic\selstore.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\spinctlg.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+SOURCE=..\..\src\generic\splitter.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\statusbr.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"

 
 

+!ENDIF
+
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+SOURCE=..\..\src\generic\tabg.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -10955,117 +4886,156 @@ SOURCE=..\..\src\univ\notebook.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\radiobox.cpp
+SOURCE=..\..\src\generic\textdlgg.cpp
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\tipwin.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\toolbkg.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\generic\treebkg.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\treectlg.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+SOURCE=..\..\src\generic\vlbox.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\generic\vscroll.cpp
+# End Source File
+# End Group
+# Begin Group "wxUniv Sources"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# PROP Default_Filter ""
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\bmpbuttn.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# PROP Exclude_From_Build 1

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+# PROP Exclude_From_Build 1

 
 

+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\button.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -11074,117 +5044,124 @@ SOURCE=..\..\src\univ\radiobox.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\radiobut.cpp
+SOURCE=..\..\src\univ\checkbox.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"

 
 

+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF

 
 

-# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\univ\checklst.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -11193,117 +5170,124 @@ SOURCE=..\..\src\univ\radiobut.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrarrow.cpp
+SOURCE=..\..\src\univ\choice.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\colschem.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -11312,117 +5296,124 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrolbar.cpp
+SOURCE=..\..\src\univ\combobox.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\control.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -11431,117 +5422,124 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrthumb.cpp
+SOURCE=..\..\src\univ\ctrlrend.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\dialog.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -11550,117 +5548,124 @@ SOURCE=..\..\src\univ\scrthumb.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\slider.cpp
+SOURCE=..\..\src\univ\framuniv.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\gauge.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -11669,117 +5674,124 @@ SOURCE=..\..\src\univ\slider.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\spinbutt.cpp
+SOURCE=..\..\src\univ\themes\gtk.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\inpcons.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -11788,117 +5800,124 @@ SOURCE=..\..\src\univ\spinbutt.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statbmp.cpp
+SOURCE=..\..\src\univ\inphand.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\listbox.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -11907,117 +5926,124 @@ SOURCE=..\..\src\univ\statbmp.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statbox.cpp
+SOURCE=..\..\src\univ\menu.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\themes\metal.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12026,117 +6052,124 @@ SOURCE=..\..\src\univ\statbox.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statline.cpp
+SOURCE=..\..\src\univ\notebook.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\radiobox.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12145,117 +6178,124 @@ SOURCE=..\..\src\univ\statline.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\stattext.cpp
+SOURCE=..\..\src\univ\radiobut.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\scrarrow.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12264,117 +6304,124 @@ SOURCE=..\..\src\univ\stattext.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statusbr.cpp
+SOURCE=..\..\src\univ\scrolbar.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\scrthumb.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12383,117 +6430,124 @@ SOURCE=..\..\src\univ\statusbr.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\textctrl.cpp
+SOURCE=..\..\src\univ\slider.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF
+
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\univ\spinbutt.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12502,117 +6556,124 @@ SOURCE=..\..\src\univ\textctrl.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\tglbtn.cpp
+SOURCE=..\..\src\univ\statbmp.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\statbox.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12621,117 +6682,124 @@ SOURCE=..\..\src\univ\tglbtn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\theme.cpp
+SOURCE=..\..\src\univ\statline.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\stattext.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12740,117 +6808,124 @@ SOURCE=..\..\src\univ\theme.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\toolbar.cpp
+SOURCE=..\..\src\univ\statusbr.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\textctrl.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12859,117 +6934,124 @@ SOURCE=..\..\src\univ\toolbar.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\topluniv.cpp
+SOURCE=..\..\src\univ\tglbtn.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\theme.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -12978,117 +7060,124 @@ SOURCE=..\..\src\univ\topluniv.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\win32.cpp
+SOURCE=..\..\src\univ\toolbar.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\topluniv.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -13097,117 +7186,124 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\winuniv.cpp
+SOURCE=..\..\src\univ\themes\win32.cpp

 
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\univ\winuniv.cpp

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 

+# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -13222,65 +7318,31 @@ SOURCE=..\..\src\univ\winuniv.cpp
 
 SOURCE=..\..\include\wx\msw\setup.h
 
 
 SOURCE=..\..\include\wx\msw\setup.h
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -13290,17 +7352,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -13310,17 +7362,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -13330,17 +7372,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -13350,125 +7382,61 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h

 InputPath=..\include\wx\msw\setup.h
 
 InputPath=..\include\wx\msw\setup.h
 

-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h

 InputPath=..\include\wx\msw\setup.h
 
 InputPath=..\include\wx\msw\setup.h
 

-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -13485,17 +7453,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -13505,17 +7463,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -13525,17 +7473,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -13545,17 +7483,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -13565,65 +7493,31 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -13633,17 +7527,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -13653,17 +7537,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -13673,7 +7547,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -13683,59 +7557,25 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
-
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # Begin Custom Build - 
 
 
 # Begin Custom Build - 
 


@@ -13928,16 +7768,7 @@ SOURCE=..\..\include\wx\msw\gdiimage.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -13946,16 +7777,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -13964,16 +7786,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -13982,16 +7795,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -14000,16 +7804,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -14018,16 +7813,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -14036,16 +7822,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -14054,16 +7831,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -14072,16 +7840,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -14090,16 +7849,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -14108,16 +7858,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -14126,16 +7867,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -14144,16 +7876,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -14162,16 +7885,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -14180,16 +7894,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -14198,16 +7903,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 


@@ -15337,6 +9033,10 @@ SOURCE=..\..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\..\include\wx\pickerbase.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\..\include\wx\popupwin.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\popupwin.h
 # End Source File
 # Begin Source File

diff --git a/build/msw/wx_dbgrid.dsp b/build/msw/wx_dbgrid.dsp
index cfc165e4b551fac64d716b3258e1357662ca5425..1a76540df7f3539051ad3fe872582c4848df9ea7 100644 (file)
--- a/build/msw/wx_dbgrid.dsp
+++ b/build/msw/wx_dbgrid.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=dbgrid - Win32 Debug USE_AUI_0
+CFG=dbgrid - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=dbgrid - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_dbgrid.mak" CFG="dbgrid - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_dbgrid.mak" CFG="dbgrid - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "dbgrid - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "dbgrid - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dbgrid - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbgrid - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=dbgrid - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\dbgrid"
-# 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_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_dbgrid_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_DBGRID" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_dbgrid_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_DBGRID
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_dbgrid_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_DBGRID
-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\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.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\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.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\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.lib"
 
 # 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\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.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\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_dbgrid.lib"
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\dbgrid"
-# 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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_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_DBGRID" /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_DBGRID" /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_DBGRID" /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_dbgrid_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_DBGRID
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_dbgrid_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_DBGRID
-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\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.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\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.lib" /debug
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.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\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.lib" /debug
 
 # 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\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.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\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_dbgrid.lib" /debug
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\dbgrid"
-# 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_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_dbgrid_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_DBGRID" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_dbgrid_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_DBGRID
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_dbgrid_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_DBGRID
-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\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.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\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.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\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.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\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.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\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_dbgrid.lib"
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\dbgrid"
-# 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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_dbgrid_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_DBGRID" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgrid_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_DBGRID
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_dbgrid_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_DBGRID
-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\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.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\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.lib" /debug
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.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\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.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\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.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\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_dbgrid.lib" /debug
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\dbgrid"
-# 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_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_dbgrid_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_DBGRID" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_dbgrid_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_DBGRID
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_dbgrid_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_DBGRID
-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\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.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\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.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\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.lib"
 
 # 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\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.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\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxbase27u_odbc.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_dbgrid.lib"
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\dbgrid"
-# 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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_dbgrid_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_DBGRID" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /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_dbgrid_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_DBGRID
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_dbgrid_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_DBGRID
-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\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.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\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.lib" /debug
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.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\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.lib" /debug
 
 # 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\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.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\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxbase27ud_odbc.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_dbgrid.lib" /debug
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\dbgrid"
-# 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_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw270_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw270_dbgrid_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_DBGRID" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_dbgrid_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_DBGRID
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_dbgrid_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_DBGRID
-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\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.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\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.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\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.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\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.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\wxmsw27_adv.lib ..\..\lib\vc_dll\wxbase27_odbc.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_dbgrid.lib"
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\dbgrid"
-# 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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_dbgrid_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_DBGRID" /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_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_dbgrid_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_DBGRID" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_dbgrid_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_DBGRID
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_dbgrid_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_DBGRID
-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\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.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\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.lib" /debug
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.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\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.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\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.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\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxbase27d_odbc.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_dbgrid.lib" /debug
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,222 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\dbgrid"
+# PROP BASE Intermediate_Dir "vc_mswunivud\dbgrid"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\dbgrid"
+# PROP Intermediate_Dir "vc_mswunivud\dbgrid"

 # PROP Target_Dir ""
 # 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.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" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.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" /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 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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_dbgrid.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.lib"

 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\dbgrid"
+# PROP BASE Intermediate_Dir "vc_mswuniv\dbgrid"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\dbgrid"
+# PROP Intermediate_Dir "vc_mswuniv\dbgrid"

 # PROP Target_Dir ""
 # 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.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" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.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" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.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__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.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__" /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 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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_dbgrid.lib"

 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\dbgrid"
+# PROP BASE Intermediate_Dir "vc_mswunivd\dbgrid"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\dbgrid"
+# PROP Intermediate_Dir "vc_mswunivd\dbgrid"

 # PROP Target_Dir ""
 # 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.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" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.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__" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.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__" /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 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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_dbgrid.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_dbgrid.lib"

 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\dbgrid"
+# PROP BASE Intermediate_Dir "vc_mswu\dbgrid"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\dbgrid"
+# PROP Intermediate_Dir "vc_mswu\dbgrid"

 # PROP Target_Dir ""
 # 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.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__" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.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" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.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" /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 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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_dbgrid.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_dbgrid.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_dbgrid.lib"

 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\dbgrid"
+# PROP BASE Intermediate_Dir "vc_mswud\dbgrid"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\dbgrid"
-# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.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__" /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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\dbgrid"
-# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.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__" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.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__" /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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\dbgrid"
-# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.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__" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.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__" /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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\dbgrid"
-# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.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" /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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\dbgrid"
-# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.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" /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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - 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\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\dbgrid"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\dbgrid"
 # PROP Target_Dir ""


@@ -712,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\dbgrid"
-# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.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" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.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" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -758,53 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\dbgrid"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.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__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\dbgrid"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\dbgrid"
-# 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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.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__" /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_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.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__" /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_dbgrid.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_dbgrid.lib"
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "dbgrid - Win32 DLL Universal Release USE_AUI_1"
-# Name "dbgrid - Win32 DLL Universal Release USE_AUI_0"
-# Name "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
-# Name "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
-# Name "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
-# Name "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
-# Name "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "dbgrid - Win32 DLL Release USE_AUI_1"
-# Name "dbgrid - Win32 DLL Release USE_AUI_0"
-# Name "dbgrid - Win32 DLL Debug USE_AUI_1"
-# Name "dbgrid - Win32 DLL Debug USE_AUI_0"
-# Name "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
-# Name "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
-# Name "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "dbgrid - Win32 Universal Release USE_AUI_1"
-# Name "dbgrid - Win32 Universal Release USE_AUI_0"
-# Name "dbgrid - Win32 Universal Debug USE_AUI_1"
-# Name "dbgrid - Win32 Universal Debug USE_AUI_0"
-# Name "dbgrid - Win32 Unicode Release USE_AUI_1"
-# Name "dbgrid - Win32 Unicode Release USE_AUI_0"
-# Name "dbgrid - Win32 Unicode Debug USE_AUI_1"
-# Name "dbgrid - Win32 Unicode Debug USE_AUI_0"
-# Name "dbgrid - Win32 Release USE_AUI_1"
-# Name "dbgrid - Win32 Release USE_AUI_0"
-# Name "dbgrid - Win32 Debug USE_AUI_1"
-# Name "dbgrid - Win32 Debug USE_AUI_0"
+# Name "dbgrid - Win32 DLL Universal Unicode Release"
+# Name "dbgrid - Win32 DLL Universal Unicode Debug"
+# Name "dbgrid - Win32 DLL Universal Release"
+# Name "dbgrid - Win32 DLL Universal Debug"
+# Name "dbgrid - Win32 DLL Unicode Release"
+# Name "dbgrid - Win32 DLL Unicode Debug"
+# Name "dbgrid - Win32 DLL Release"
+# Name "dbgrid - Win32 DLL Debug"
+# Name "dbgrid - Win32 Universal Unicode Release"
+# Name "dbgrid - Win32 Universal Unicode Debug"
+# Name "dbgrid - Win32 Universal Release"
+# Name "dbgrid - Win32 Universal Debug"
+# Name "dbgrid - Win32 Unicode Release"
+# Name "dbgrid - Win32 Unicode Debug"
+# Name "dbgrid - Win32 Release"
+# Name "dbgrid - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -884,115 +468,59 @@ SOURCE=..\..\src\common\dummy.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1007,7 +535,7 @@ SOURCE=..\..\src\msw\version.rc
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1017,17 +545,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1037,27 +555,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1067,268 +565,136 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_1"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-# Begin Custom Build - 
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-SOURCE=..\..\include\wx\msw\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build

 
 

-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_1"
+!ENDIF

 
 

-# Begin Custom Build - 
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\include\wx\msw\setup.h

 
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"

 
 

-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1338,17 +704,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1358,17 +714,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1378,17 +724,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1398,65 +734,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1466,17 +768,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1486,17 +778,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1506,17 +788,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1537,7 +809,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1546,25 +818,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1573,7 +827,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1582,25 +836,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1609,7 +845,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1618,25 +854,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1645,7 +863,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1654,25 +872,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1681,7 +881,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1690,25 +890,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1717,7 +899,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1726,25 +908,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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)" == "dbgrid - 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)" == "dbgrid - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1753,7 +917,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1762,25 +926,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - 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
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1789,7 +935,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1798,25 +944,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_gl.dsp b/build/msw/wx_gl.dsp
index 57a9b853247d9a4c8cc066e181ac548f1be78616..28449f5450f531b7d8079271a6a89d2371e2dd8b 100644 (file)
--- a/build/msw/wx_gl.dsp
+++ b/build/msw/wx_gl.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=gl - Win32 Debug USE_AUI_0
+CFG=gl - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=gl - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_gl.mak" CFG="gl - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_gl.mak" CFG="gl - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "gl - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gl - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "gl - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gl - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "gl - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=gl - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\gl"
-# 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_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_gl_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_GL" /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_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_gl_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_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_gl_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_GL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_gl_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_GL
-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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.lib"
 
 # 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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.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 wxmswuniv27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_gl.lib"
 

-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\gl"
-# 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_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_gl_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_GL" /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_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_gl_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_GL" /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_GL" /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_GL" /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_gl_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_GL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_gl_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_GL
-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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.lib" /debug
 
 # 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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.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 wxmswuniv27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_gl.lib" /debug
 

-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\gl"
-# 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_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_gl_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_GL" /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_gldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_gl_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_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_gl_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_GL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_gl_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_GL
-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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.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 wxmswuniv27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_gl.lib"
 

-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\gl"
-# 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_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_gl_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_GL" /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_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_gl_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_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /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_gl_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_GL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_gl_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_GL
-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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.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 wxmswuniv27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_gl.lib" /debug
 

-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\gl"
-# 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_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_gl_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_GL" /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_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_gl_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_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_gl_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_GL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_gl_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_GL
-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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.lib"
 
 # 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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.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 wxmsw27u_core.lib wxbase27u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_gl.lib"
 

-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\gl"
-# 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_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_gl_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_GL" /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_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_gl_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_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /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_gl_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_GL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_gl_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_GL
-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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.lib" /debug
 
 # 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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.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 wxmsw27ud_core.lib wxbase27ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_gl.lib" /debug
 

-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\gl"
-# 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_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw270_gl_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_GL" /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_gldll.pch" /Fd..\..\lib\vc_dll\wxmsw270_gl_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_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_gl_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_GL
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_gl_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_GL
-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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.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 wxmsw27_core.lib wxbase27.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_gl.lib"
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\gl"
-# 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_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_gl_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_GL" /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_gldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_gl_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_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_gl_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_GL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_gl_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_GL
-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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.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 wxmsw27d_core.lib wxbase27d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_gl.lib" /debug
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,222 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\gl"
+# PROP BASE Intermediate_Dir "vc_mswunivud\gl"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\gl"
+# PROP Intermediate_Dir "vc_mswunivud\gl"

 # PROP Target_Dir ""
 # 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.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" /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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.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" /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 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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_gl.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_gl.lib"

 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\gl"
+# PROP BASE Intermediate_Dir "vc_mswuniv\gl"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\gl"
+# PROP Intermediate_Dir "vc_mswuniv\gl"

 # PROP Target_Dir ""
 # 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.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" /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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.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" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.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__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.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__" /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 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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_gl.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_gl.lib"

 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\gl"
+# PROP BASE Intermediate_Dir "vc_mswunivd\gl"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\gl"
+# PROP Intermediate_Dir "vc_mswunivd\gl"

 # PROP Target_Dir ""
 # 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.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" /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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.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__" /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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.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__" /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 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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_gl.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_gl.lib"

 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\gl"
+# PROP BASE Intermediate_Dir "vc_mswu\gl"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\gl"
+# PROP Intermediate_Dir "vc_mswu\gl"

 # PROP Target_Dir ""
 # 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.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__" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.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" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.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" /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 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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_gl.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_gl.lib"

 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\gl"
+# PROP BASE Intermediate_Dir "vc_mswud\gl"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\gl"
-# 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.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__" /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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\gl"
-# 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.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__" /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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.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__" /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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\gl"
-# 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.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__" /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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.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__" /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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\gl"
-# 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.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" /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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\gl"
-# 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.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" /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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - 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\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\gl"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\gl"
 # PROP Target_Dir ""


@@ -712,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\gl"
-# 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.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" /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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.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" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -758,53 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\gl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.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__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\gl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\gl"
-# 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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.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__" /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_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.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__" /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_gl.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_gl.lib"
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "gl - Win32 DLL Universal Release USE_AUI_1"
-# Name "gl - Win32 DLL Universal Release USE_AUI_0"
-# Name "gl - Win32 DLL Universal Debug USE_AUI_1"
-# Name "gl - Win32 DLL Universal Debug USE_AUI_0"
-# Name "gl - Win32 DLL Unicode Release USE_AUI_1"
-# Name "gl - Win32 DLL Unicode Release USE_AUI_0"
-# Name "gl - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "gl - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "gl - Win32 DLL Release USE_AUI_1"
-# Name "gl - Win32 DLL Release USE_AUI_0"
-# Name "gl - Win32 DLL Debug USE_AUI_1"
-# Name "gl - Win32 DLL Debug USE_AUI_0"
-# Name "gl - Win32 Universal Unicode Release USE_AUI_1"
-# Name "gl - Win32 Universal Unicode Release USE_AUI_0"
-# Name "gl - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "gl - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "gl - Win32 Universal Release USE_AUI_1"
-# Name "gl - Win32 Universal Release USE_AUI_0"
-# Name "gl - Win32 Universal Debug USE_AUI_1"
-# Name "gl - Win32 Universal Debug USE_AUI_0"
-# Name "gl - Win32 Unicode Release USE_AUI_1"
-# Name "gl - Win32 Unicode Release USE_AUI_0"
-# Name "gl - Win32 Unicode Debug USE_AUI_1"
-# Name "gl - Win32 Unicode Debug USE_AUI_0"
-# Name "gl - Win32 Release USE_AUI_1"
-# Name "gl - Win32 Release USE_AUI_0"
-# Name "gl - Win32 Debug USE_AUI_1"
-# Name "gl - Win32 Debug USE_AUI_0"
+# Name "gl - Win32 DLL Universal Unicode Release"
+# Name "gl - Win32 DLL Universal Unicode Debug"
+# Name "gl - Win32 DLL Universal Release"
+# Name "gl - Win32 DLL Universal Debug"
+# Name "gl - Win32 DLL Unicode Release"
+# Name "gl - Win32 DLL Unicode Debug"
+# Name "gl - Win32 DLL Release"
+# Name "gl - Win32 DLL Debug"
+# Name "gl - Win32 Universal Unicode Release"
+# Name "gl - Win32 Universal Unicode Debug"
+# Name "gl - Win32 Universal Release"
+# Name "gl - Win32 Universal Debug"
+# Name "gl - Win32 Unicode Release"
+# Name "gl - Win32 Unicode Debug"
+# Name "gl - Win32 Release"
+# Name "gl - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -884,115 +468,59 @@ SOURCE=..\..\src\msw\glcanvas.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1007,7 +535,7 @@ SOURCE=..\..\src\msw\version.rc
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1017,17 +545,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1037,27 +555,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1067,268 +565,136 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - 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)" == "gl - 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)" == "gl - 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)" == "gl - 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)" == "gl - 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)" == "gl - 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)" == "gl - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_1"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-# Begin Custom Build - 
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-SOURCE=..\..\include\wx\msw\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build

 
 

-!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_1"
+!ENDIF

 
 

-# Begin Custom Build - 
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\include\wx\msw\setup.h

 
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"

 
 

-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1338,17 +704,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1358,17 +714,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1378,17 +724,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1398,65 +734,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1466,17 +768,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1486,17 +778,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1506,17 +788,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1537,7 +809,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1546,25 +818,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1573,7 +827,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1582,25 +836,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1609,7 +845,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1618,25 +854,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1645,7 +863,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1654,25 +872,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1681,7 +881,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1690,25 +890,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1717,7 +899,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1726,25 +908,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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)" == "gl - 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)" == "gl - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1753,7 +917,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1762,25 +926,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - 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
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1789,7 +935,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "gl - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1798,25 +944,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "gl - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "gl - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "gl - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp
index 913e5da52bd77069b57ad11cfd6ffe94e54a1236..c7bf6fa1941d22308e2b8b2dce783f399b472867 100644 (file)
--- a/build/msw/wx_html.dsp
+++ b/build/msw/wx_html.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=html - Win32 Debug USE_AUI_0
+CFG=html - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=html - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_html.mak" CFG="html - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_html.mak" CFG="html - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "html - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "html - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "html - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "html - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "html - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=html - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\html"
-# 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_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_html_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_HTML" /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_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_html_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_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_html_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_HTML
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_html_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_HTML
-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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.lib"
 
 # 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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_html.lib"
 

-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\html"
-# 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_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_html_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_HTML" /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_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_html_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_HTML" /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_HTML" /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_HTML" /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_html_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_HTML
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_html_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_HTML
-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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.lib" /debug
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.lib" /debug
 
 # 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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_html.lib" /debug
 

-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\html"
-# 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_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_html_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_HTML" /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_htmldll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_html_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_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_html_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_HTML
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_html_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_HTML
-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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_html.lib"
 

-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\html"
-# 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_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_html_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_HTML" /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_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_html_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_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /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_html_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_HTML
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_html_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_HTML
-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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.lib" /debug
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_html.lib" /debug
 

-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\html"
-# 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_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_html_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_HTML" /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_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_html_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_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_html_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_HTML
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_html_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_HTML
-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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.lib"
 
 # 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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_html.lib"
 

-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\html"
-# 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_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_html_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_HTML" /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_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_html_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_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /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_html_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_HTML
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_html_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_HTML
-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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.lib" /debug
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.lib" /debug
 
 # 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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_html.lib" /debug
 

-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\html"
-# 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_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw270_html_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_HTML" /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_htmldll.pch" /Fd..\..\lib\vc_dll\wxmsw270_html_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_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_html_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_HTML
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_html_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_HTML
-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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_html.lib"
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\html"
-# 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_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_html_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_HTML" /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_htmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_html_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_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_html_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_HTML
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_html_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_HTML
-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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.lib" /debug
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_html.lib" /debug
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,245 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\html"
+# PROP BASE Intermediate_Dir "vc_mswunivud\html"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\html"
+# PROP Intermediate_Dir "vc_mswunivud\html"

 # PROP Target_Dir ""
 # 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.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" /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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.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" /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 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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_html.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_html.lib"

 
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\html"
+# PROP BASE Intermediate_Dir "vc_mswuniv\html"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\html"
+# PROP Intermediate_Dir "vc_mswuniv\html"

 # PROP Target_Dir ""
 # 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.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" /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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.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" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.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__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.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__" /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 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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_html.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_html.lib"

 
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\html"
+# PROP BASE Intermediate_Dir "vc_mswunivd\html"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\html"
+# PROP Intermediate_Dir "vc_mswunivd\html"

 # PROP Target_Dir ""
 # 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.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" /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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.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__" /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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.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__" /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 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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_html.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_html.lib"

 
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\html"
+# PROP BASE Intermediate_Dir "vc_mswu\html"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\html"
+# PROP Intermediate_Dir "vc_mswu\html"

 # PROP Target_Dir ""
 # 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.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__" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.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" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.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" /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 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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_html.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_html.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_html.lib"

 
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\html"
+# PROP BASE Intermediate_Dir "vc_mswud\html"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\html"
-# 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.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__" /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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\html"
-# 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.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__" /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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.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__" /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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\html"
-# 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.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__" /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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.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__" /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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\html"
-# 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.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" /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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\html"
-# 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.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" /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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - 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\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\html"
-# 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.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" /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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.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" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\html"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\html"
 # PROP Target_Dir ""


@@ -735,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_html.lib"
 

-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\html"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.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__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -781,30 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_html.lib"
 

-!ELSEIF  "$(CFG)" == "html - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\html"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\html"
-# 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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.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__" /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_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.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__" /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_html.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_html.lib"
-
-!ELSEIF  "$(CFG)" == "html - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "html - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "html - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "html - Win32 DLL Universal Release USE_AUI_1"
-# Name "html - Win32 DLL Universal Release USE_AUI_0"
-# Name "html - Win32 DLL Universal Debug USE_AUI_1"
-# Name "html - Win32 DLL Universal Debug USE_AUI_0"
-# Name "html - Win32 DLL Unicode Release USE_AUI_1"
-# Name "html - Win32 DLL Unicode Release USE_AUI_0"
-# Name "html - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "html - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "html - Win32 DLL Release USE_AUI_1"
-# Name "html - Win32 DLL Release USE_AUI_0"
-# Name "html - Win32 DLL Debug USE_AUI_1"
-# Name "html - Win32 DLL Debug USE_AUI_0"
-# Name "html - Win32 Universal Unicode Release USE_AUI_1"
-# Name "html - Win32 Universal Unicode Release USE_AUI_0"
-# Name "html - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "html - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "html - Win32 Universal Release USE_AUI_1"
-# Name "html - Win32 Universal Release USE_AUI_0"
-# Name "html - Win32 Universal Debug USE_AUI_1"
-# Name "html - Win32 Universal Debug USE_AUI_0"
-# Name "html - Win32 Unicode Release USE_AUI_1"
-# Name "html - Win32 Unicode Release USE_AUI_0"
-# Name "html - Win32 Unicode Debug USE_AUI_1"
-# Name "html - Win32 Unicode Debug USE_AUI_0"
-# Name "html - Win32 Release USE_AUI_1"
-# Name "html - Win32 Release USE_AUI_0"
-# Name "html - Win32 Debug USE_AUI_1"
-# Name "html - Win32 Debug USE_AUI_0"
+# Name "html - Win32 DLL Universal Unicode Release"
+# Name "html - Win32 DLL Universal Unicode Debug"
+# Name "html - Win32 DLL Universal Release"
+# Name "html - Win32 DLL Universal Debug"
+# Name "html - Win32 DLL Unicode Release"
+# Name "html - Win32 DLL Unicode Debug"
+# Name "html - Win32 DLL Release"
+# Name "html - Win32 DLL Debug"
+# Name "html - Win32 Universal Unicode Release"
+# Name "html - Win32 Universal Unicode Debug"
+# Name "html - Win32 Universal Release"
+# Name "html - Win32 Universal Debug"
+# Name "html - Win32 Unicode Release"
+# Name "html - Win32 Unicode Debug"
+# Name "html - Win32 Release"
+# Name "html - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -884,115 +468,59 @@ SOURCE=..\..\src\msw\helpbest.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "html - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "html - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1107,65 +635,31 @@ SOURCE=..\..\src\html\winpars.cpp
 
 SOURCE=..\..\include\wx\msw\setup.h
 
 
 SOURCE=..\..\include\wx\msw\setup.h
 

-!IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1175,17 +669,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1195,7 +679,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1205,29 +689,9 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"

 
 

-# 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)" == "html - 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)" == "html - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+# 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)"
 InputPath=..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"


@@ -1235,55 +699,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1293,27 +733,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1323,7 +743,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1333,27 +753,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1370,7 +770,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1380,27 +780,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1410,7 +790,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1420,17 +800,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1440,65 +810,31 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1508,27 +844,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1538,17 +854,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1558,7 +864,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1568,59 +874,25 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Debug"

 
 # Begin Custom Build - 
 
 
 # Begin Custom Build - 
 


@@ -1637,16 +909,7 @@ InputPath=..\include\wx\univ\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "html - 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)" == "html - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1655,7 +918,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1664,25 +927,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1691,7 +936,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1700,25 +945,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1727,7 +954,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1736,16 +963,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1754,25 +972,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1781,7 +981,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1790,25 +990,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1817,7 +999,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1826,25 +1008,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - 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)" == "html - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1853,16 +1017,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - 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)" == "html - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1871,7 +1026,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1880,16 +1035,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "html - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1898,25 +1044,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "html - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "html - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "html - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_media.dsp b/build/msw/wx_media.dsp
index 55be59359e6e4deedf20e182754011e2d7b2e597..62e8ff6dfc831f5a39f3efb9117f26c98f323654 100644 (file)
--- a/build/msw/wx_media.dsp
+++ b/build/msw/wx_media.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=media - Win32 Debug USE_AUI_0
+CFG=media - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=media - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_media.mak" CFG="media - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_media.mak" CFG="media - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "media - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "media - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "media - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "media - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "media - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=media - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\media"
-# 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_mediadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_media_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_MEDIA" /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_mediadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_media_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_MEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_media_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_MEDIA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_media_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_MEDIA
-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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.lib"
 
 # 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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_media.lib"
 

-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\media"
-# 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_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_media_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_MEDIA" /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_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_media_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_MEDIA" /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_MEDIA" /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_MEDIA" /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_media_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_MEDIA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_media_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_MEDIA
-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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.lib" /debug
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.lib" /debug
 
 # 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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_media.lib" /debug
 

-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\media"
-# 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_mediadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_media_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_MEDIA" /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_mediadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_media_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_MEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_media_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_MEDIA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_media_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_MEDIA
-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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_media.lib"
 

-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\media"
-# 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_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_media_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_MEDIA" /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_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_media_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_MEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /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_media_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_MEDIA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_media_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_MEDIA
-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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.lib" /debug
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_media.lib" /debug
 

-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\media"
-# 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_mediadll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_media_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_MEDIA" /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_mediadll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_media_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_MEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_media_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_MEDIA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_media_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_MEDIA
-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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.lib"
 
 # 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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_media.lib"
 

-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\media"
-# 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_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_media_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_MEDIA" /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_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_media_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_MEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /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_media_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_MEDIA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_media_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_MEDIA
-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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.lib" /debug
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.lib" /debug
 
 # 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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_media.lib" /debug
 

-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\media"
-# 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_mediadll.pch" /Fd..\..\lib\vc_dll\wxmsw270_media_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_MEDIA" /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_mediadll.pch" /Fd..\..\lib\vc_dll\wxmsw270_media_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_MEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_media_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_MEDIA
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_media_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_MEDIA
-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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_media.lib"
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\media"
-# 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_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_media_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_MEDIA" /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_mediadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_media_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_MEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_media_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_MEDIA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_media_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_MEDIA
-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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.lib" /debug
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_media.lib" /debug
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,222 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\media"
+# PROP BASE Intermediate_Dir "vc_mswunivud\media"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\media"
+# PROP Intermediate_Dir "vc_mswunivud\media"

 # PROP Target_Dir ""
 # 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_medialib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_medialib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_medialib.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" /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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_medialib.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" /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 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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_media.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_media.lib"

 
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\media"
+# PROP BASE Intermediate_Dir "vc_mswuniv\media"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\media"
+# PROP Intermediate_Dir "vc_mswuniv\media"

 # PROP Target_Dir ""
 # 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_medialib.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" /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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_medialib.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" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_medialib.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__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_medialib.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__" /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 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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_media.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_media.lib"

 
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\media"
+# PROP BASE Intermediate_Dir "vc_mswunivd\media"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\media"
+# PROP Intermediate_Dir "vc_mswunivd\media"

 # PROP Target_Dir ""
 # 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_medialib.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" /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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_medialib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_medialib.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__" /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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_medialib.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__" /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 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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_media.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_media.lib"

 
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\media"
+# PROP BASE Intermediate_Dir "vc_mswu\media"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\media"
+# PROP Intermediate_Dir "vc_mswu\media"

 # PROP Target_Dir ""
 # 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_medialib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_medialib.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__" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.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" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.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" /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 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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_media.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_media.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_media.lib"

 
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\media"
+# PROP BASE Intermediate_Dir "vc_mswud\media"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\media"
-# 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_medialib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_medialib.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__" /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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\media"
-# 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_medialib.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__" /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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_medialib.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__" /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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\media"
-# 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_medialib.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__" /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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_medialib.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__" /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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\media"
-# 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.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" /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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\media"
-# 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_medialib.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" /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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - 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\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\media"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\media"
 # PROP Target_Dir ""


@@ -712,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\media"
-# 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_medialib.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" /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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_medialib.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" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -758,53 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
 

-!ELSEIF  "$(CFG)" == "media - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\media"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_medialib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_media.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_medialib.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__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\media"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\media"
-# 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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_medialib.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__" /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_media.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_medialib.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__" /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_media.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_media.lib"
-
-!ELSEIF  "$(CFG)" == "media - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "media - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "media - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "media - Win32 DLL Universal Release USE_AUI_1"
-# Name "media - Win32 DLL Universal Release USE_AUI_0"
-# Name "media - Win32 DLL Universal Debug USE_AUI_1"
-# Name "media - Win32 DLL Universal Debug USE_AUI_0"
-# Name "media - Win32 DLL Unicode Release USE_AUI_1"
-# Name "media - Win32 DLL Unicode Release USE_AUI_0"
-# Name "media - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "media - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "media - Win32 DLL Release USE_AUI_1"
-# Name "media - Win32 DLL Release USE_AUI_0"
-# Name "media - Win32 DLL Debug USE_AUI_1"
-# Name "media - Win32 DLL Debug USE_AUI_0"
-# Name "media - Win32 Universal Unicode Release USE_AUI_1"
-# Name "media - Win32 Universal Unicode Release USE_AUI_0"
-# Name "media - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "media - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "media - Win32 Universal Release USE_AUI_1"
-# Name "media - Win32 Universal Release USE_AUI_0"
-# Name "media - Win32 Universal Debug USE_AUI_1"
-# Name "media - Win32 Universal Debug USE_AUI_0"
-# Name "media - Win32 Unicode Release USE_AUI_1"
-# Name "media - Win32 Unicode Release USE_AUI_0"
-# Name "media - Win32 Unicode Debug USE_AUI_1"
-# Name "media - Win32 Unicode Debug USE_AUI_0"
-# Name "media - Win32 Release USE_AUI_1"
-# Name "media - Win32 Release USE_AUI_0"
-# Name "media - Win32 Debug USE_AUI_1"
-# Name "media - Win32 Debug USE_AUI_0"
+# Name "media - Win32 DLL Universal Unicode Release"
+# Name "media - Win32 DLL Universal Unicode Debug"
+# Name "media - Win32 DLL Universal Release"
+# Name "media - Win32 DLL Universal Debug"
+# Name "media - Win32 DLL Unicode Release"
+# Name "media - Win32 DLL Unicode Debug"
+# Name "media - Win32 DLL Release"
+# Name "media - Win32 DLL Debug"
+# Name "media - Win32 Universal Unicode Release"
+# Name "media - Win32 Universal Unicode Debug"
+# Name "media - Win32 Universal Release"
+# Name "media - Win32 Universal Debug"
+# Name "media - Win32 Unicode Release"
+# Name "media - Win32 Unicode Debug"
+# Name "media - Win32 Release"
+# Name "media - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -896,115 +480,59 @@ SOURCE=..\..\src\msw\mediactrl_wmp10.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "media - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "media - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "media - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "media - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1019,7 +547,7 @@ SOURCE=..\..\src\msw\version.rc
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1029,17 +557,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1049,27 +567,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1079,268 +577,136 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - 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)" == "media - 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)" == "media - 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)" == "media - 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)" == "media - 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)" == "media - 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)" == "media - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release USE_AUI_1"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-# Begin Custom Build - 
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-SOURCE=..\..\include\wx\msw\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build

 
 

-!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_1"
+!ENDIF

 
 

-# Begin Custom Build - 
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\include\wx\msw\setup.h

 
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug"

 
 

-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1350,17 +716,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1370,17 +726,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1390,17 +736,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1410,65 +746,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1478,17 +780,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1498,17 +790,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1518,17 +800,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1553,7 +825,7 @@ SOURCE=..\..\include\wx\msw\ole\activex.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1562,25 +834,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1589,7 +843,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1598,25 +852,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1625,7 +861,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1634,25 +870,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1661,7 +879,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1670,25 +888,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1697,7 +897,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1706,25 +906,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1733,7 +915,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1742,25 +924,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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)" == "media - 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)" == "media - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1769,7 +933,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1778,25 +942,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - 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
-
-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1805,7 +951,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "media - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1814,25 +960,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "media - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "media - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "media - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp
index 57c80be12852ad29aeb7f282233ca7475c282df9..dd3b69a7570605223c8fef0c77bf1c864470c87a 100644 (file)
--- a/build/msw/wx_net.dsp
+++ b/build/msw/wx_net.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=net - Win32 Debug USE_AUI_0
+CFG=net - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=net - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_net.mak" CFG="net - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_net.mak" CFG="net - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "net - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "net - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "net - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "net - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "net - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=net - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\net"
-# 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_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
-# ADD LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 # ADD LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 
 # ADD BASE LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 # ADD LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 

-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\net"
-# 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_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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=wxbase270ud_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
-# ADD LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 # ADD LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 # ADD LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 

-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\net"
-# 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_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
-# ADD LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 # ADD LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 
 # ADD BASE LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 # ADD LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 

-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\net"
-# 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_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
-# ADD LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 # ADD LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 # ADD LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 

-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\net"
-# 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_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
-# ADD LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 # ADD LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 
 # ADD BASE LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 # ADD LINK32 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\wxbase270u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_net.lib"
 

-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\net"
-# 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_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
-# ADD LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 # ADD LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 # ADD LINK32 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\wxbase270ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_net.lib" /debug
 

-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\net"
-# 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_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Fd..\..\lib\vc_dll\wxbase270_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
-# ADD LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 # ADD LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 
 # ADD BASE LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 # ADD LINK32 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\wxbase270_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_net.lib"
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\net"
-# 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_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_net_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
-# ADD LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 # ADD LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 # ADD LINK32 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\wxbase270d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_net.lib" /debug
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,222 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\net"
+# PROP BASE Intermediate_Dir "vc_mswunivud\net"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\net"
+# PROP Intermediate_Dir "vc_mswunivud\net"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.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_GUI=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\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.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_GUI=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 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\wxbase27u_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"

 
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\net"
+# PROP BASE Intermediate_Dir "vc_mswuniv\net"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\net"
+# PROP Intermediate_Dir "vc_mswuniv\net"

 # PROP Target_Dir ""
 # 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\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.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_GUI=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\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.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_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.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_GUI=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 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\wxbase27ud_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"

 
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\net"
+# PROP BASE Intermediate_Dir "vc_mswunivd\net"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\net"
+# PROP Intermediate_Dir "vc_mswunivd\net"

 # PROP Target_Dir ""
 # 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\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.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_GUI=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\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.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_GUI=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\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.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_GUI=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 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\wxbase27ud_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"

 
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\net"
+# PROP BASE Intermediate_Dir "vc_mswu\net"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\net"
+# PROP Intermediate_Dir "vc_mswu\net"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.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_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.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_GUI=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 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\wxbase27_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"

 
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\net"
+# PROP BASE Intermediate_Dir "vc_mswud\net"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\net"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.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_GUI=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\wxbase27_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\net"
-# 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\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.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_GUI=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\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.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_GUI=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\wxbase27d_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\net"
-# 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\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.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_GUI=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\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.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_GUI=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\wxbase27d_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\net"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.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_GUI=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\wxbase27u_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\net"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.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_GUI=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\wxbase27u_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - 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\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\net"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\net"
 # PROP Target_Dir ""


@@ -712,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\net"
-# 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\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.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_GUI=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\wxbase27ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.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_GUI=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\wxbase27ud_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -758,53 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
 

-!ELSEIF  "$(CFG)" == "net - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\net"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.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_GUI=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\wxbase27_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\net"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\net"
-# 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\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.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_GUI=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\wxbase27d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.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_GUI=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\wxbase27d_net.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_net.lib"
-
-!ELSEIF  "$(CFG)" == "net - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "net - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "net - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "net - Win32 DLL Universal Release USE_AUI_1"
-# Name "net - Win32 DLL Universal Release USE_AUI_0"
-# Name "net - Win32 DLL Universal Debug USE_AUI_1"
-# Name "net - Win32 DLL Universal Debug USE_AUI_0"
-# Name "net - Win32 DLL Unicode Release USE_AUI_1"
-# Name "net - Win32 DLL Unicode Release USE_AUI_0"
-# Name "net - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "net - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "net - Win32 DLL Release USE_AUI_1"
-# Name "net - Win32 DLL Release USE_AUI_0"
-# Name "net - Win32 DLL Debug USE_AUI_1"
-# Name "net - Win32 DLL Debug USE_AUI_0"
-# Name "net - Win32 Universal Unicode Release USE_AUI_1"
-# Name "net - Win32 Universal Unicode Release USE_AUI_0"
-# Name "net - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "net - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "net - Win32 Universal Release USE_AUI_1"
-# Name "net - Win32 Universal Release USE_AUI_0"
-# Name "net - Win32 Universal Debug USE_AUI_1"
-# Name "net - Win32 Universal Debug USE_AUI_0"
-# Name "net - Win32 Unicode Release USE_AUI_1"
-# Name "net - Win32 Unicode Release USE_AUI_0"
-# Name "net - Win32 Unicode Debug USE_AUI_1"
-# Name "net - Win32 Unicode Debug USE_AUI_0"
-# Name "net - Win32 Release USE_AUI_1"
-# Name "net - Win32 Release USE_AUI_0"
-# Name "net - Win32 Debug USE_AUI_1"
-# Name "net - Win32 Debug USE_AUI_0"
+# Name "net - Win32 DLL Universal Unicode Release"
+# Name "net - Win32 DLL Universal Unicode Debug"
+# Name "net - Win32 DLL Universal Release"
+# Name "net - Win32 DLL Universal Debug"
+# Name "net - Win32 DLL Unicode Release"
+# Name "net - Win32 DLL Unicode Debug"
+# Name "net - Win32 DLL Release"
+# Name "net - Win32 DLL Debug"
+# Name "net - Win32 Universal Unicode Release"
+# Name "net - Win32 Universal Unicode Debug"
+# Name "net - Win32 Universal Release"
+# Name "net - Win32 Universal Debug"
+# Name "net - Win32 Unicode Release"
+# Name "net - Win32 Unicode Debug"
+# Name "net - Win32 Release"
+# Name "net - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -928,115 +512,59 @@ SOURCE=..\..\src\msw\urlmsw.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "net - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "net - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "net - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "net - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1051,7 +579,7 @@ SOURCE=..\..\src\msw\version.rc
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1061,17 +589,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1081,27 +599,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1111,268 +609,136 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - 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)" == "net - 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)" == "net - 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)" == "net - 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)" == "net - 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)" == "net - 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)" == "net - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release USE_AUI_1"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-# Begin Custom Build - 
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-SOURCE=..\..\include\wx\msw\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build

 
 

-!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_1"
+!ENDIF

 
 

-# Begin Custom Build - 
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\include\wx\msw\setup.h

 
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug"

 
 

-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1382,17 +748,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1402,17 +758,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1422,17 +768,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1442,65 +778,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1510,17 +812,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1530,17 +822,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1550,17 +832,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1581,7 +853,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1590,25 +862,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1617,7 +871,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1626,25 +880,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1653,7 +889,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1662,25 +898,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1689,7 +907,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1698,25 +916,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1725,7 +925,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1734,25 +934,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1761,7 +943,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1770,25 +952,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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)" == "net - 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)" == "net - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1797,7 +961,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1806,25 +970,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - 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
-
-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1833,7 +979,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "net - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1842,25 +988,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "net - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "net - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "net - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_odbc.dsp b/build/msw/wx_odbc.dsp
index 9e11b93a4dafe19ebad9ff2bb122d825401dc3f5..11896f2911db0912c6bc00bc0d15abfc83300cc0 100644 (file)
--- a/build/msw/wx_odbc.dsp
+++ b/build/msw/wx_odbc.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=odbc - Win32 Debug USE_AUI_0
+CFG=odbc - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=odbc - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_odbc.mak" CFG="odbc - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_odbc.mak" CFG="odbc - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "odbc - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "odbc - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "odbc - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "odbc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "odbc - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=odbc - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\odbc"
-# 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_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
-# ADD LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 # ADD LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 
 # ADD BASE LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 # ADD LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 

-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\odbc"
-# 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_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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=wxbase270ud_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
-# ADD LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 # ADD LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 # ADD LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 

-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\odbc"
-# 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_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
-# ADD LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 # ADD LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 
 # ADD BASE LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 # ADD LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 

-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\odbc"
-# 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_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
-# ADD LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 # ADD LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 # ADD LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 

-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\odbc"
-# 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_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270u_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
-# ADD LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 # ADD LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 
 # ADD BASE LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 # ADD LINK32 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\wxbase270u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_odbc.lib"
 

-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\odbc"
-# 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_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
-# ADD LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 # ADD LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 # ADD LINK32 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\wxbase270ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_odbc.lib" /debug
 

-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\odbc"
-# 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_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase270_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
-# ADD LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 # ADD LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 
 # ADD BASE LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 # ADD LINK32 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\wxbase270_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_odbc.lib"
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\odbc"
-# 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_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /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_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_odbc_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_odbc_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
-# ADD LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 # ADD LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 # ADD LINK32 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\wxbase270d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_odbc.lib" /debug
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,222 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\odbc"
+# PROP BASE Intermediate_Dir "vc_mswunivud\odbc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\odbc"
+# PROP Intermediate_Dir "vc_mswunivud\odbc"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_GUI=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\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_GUI=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 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\wxbase27u_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"

 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\odbc"
+# PROP BASE Intermediate_Dir "vc_mswuniv\odbc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\odbc"
+# PROP Intermediate_Dir "vc_mswuniv\odbc"

 # PROP Target_Dir ""
 # 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\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_GUI=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\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.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_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.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_GUI=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 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\wxbase27ud_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"

 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\odbc"
+# PROP BASE Intermediate_Dir "vc_mswunivd\odbc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\odbc"
+# PROP Intermediate_Dir "vc_mswunivd\odbc"

 # PROP Target_Dir ""
 # 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\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_GUI=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\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_GUI=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\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_GUI=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 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\wxbase27ud_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"

 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\odbc"
+# PROP BASE Intermediate_Dir "vc_mswu\odbc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\odbc"
+# PROP Intermediate_Dir "vc_mswu\odbc"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.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_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.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_GUI=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 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\wxbase27_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"

 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\odbc"
+# PROP BASE Intermediate_Dir "vc_mswud\odbc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\odbc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.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_GUI=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\wxbase27_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\odbc"
-# 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\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_GUI=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\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_GUI=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\wxbase27d_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\odbc"
-# 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\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_GUI=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\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.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_GUI=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\wxbase27d_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\odbc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.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_GUI=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\wxbase27u_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\odbc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.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_GUI=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\wxbase27u_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - 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\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\odbc"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\odbc"
 # PROP Target_Dir ""


@@ -712,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\odbc"
-# 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\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.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_GUI=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\wxbase27ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.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_GUI=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\wxbase27ud_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -758,53 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\odbc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.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_GUI=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\wxbase27_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\odbc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\odbc"
-# 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\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.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_GUI=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\wxbase27d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.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_GUI=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\wxbase27d_odbc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_odbc.lib"
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "odbc - Win32 DLL Universal Release USE_AUI_1"
-# Name "odbc - Win32 DLL Universal Release USE_AUI_0"
-# Name "odbc - Win32 DLL Universal Debug USE_AUI_1"
-# Name "odbc - Win32 DLL Universal Debug USE_AUI_0"
-# Name "odbc - Win32 DLL Unicode Release USE_AUI_1"
-# Name "odbc - Win32 DLL Unicode Release USE_AUI_0"
-# Name "odbc - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "odbc - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "odbc - Win32 DLL Release USE_AUI_1"
-# Name "odbc - Win32 DLL Release USE_AUI_0"
-# Name "odbc - Win32 DLL Debug USE_AUI_1"
-# Name "odbc - Win32 DLL Debug USE_AUI_0"
-# Name "odbc - Win32 Universal Unicode Release USE_AUI_1"
-# Name "odbc - Win32 Universal Unicode Release USE_AUI_0"
-# Name "odbc - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "odbc - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "odbc - Win32 Universal Release USE_AUI_1"
-# Name "odbc - Win32 Universal Release USE_AUI_0"
-# Name "odbc - Win32 Universal Debug USE_AUI_1"
-# Name "odbc - Win32 Universal Debug USE_AUI_0"
-# Name "odbc - Win32 Unicode Release USE_AUI_1"
-# Name "odbc - Win32 Unicode Release USE_AUI_0"
-# Name "odbc - Win32 Unicode Debug USE_AUI_1"
-# Name "odbc - Win32 Unicode Debug USE_AUI_0"
-# Name "odbc - Win32 Release USE_AUI_1"
-# Name "odbc - Win32 Release USE_AUI_0"
-# Name "odbc - Win32 Debug USE_AUI_1"
-# Name "odbc - Win32 Debug USE_AUI_0"
+# Name "odbc - Win32 DLL Universal Unicode Release"
+# Name "odbc - Win32 DLL Universal Unicode Debug"
+# Name "odbc - Win32 DLL Universal Release"
+# Name "odbc - Win32 DLL Universal Debug"
+# Name "odbc - Win32 DLL Unicode Release"
+# Name "odbc - Win32 DLL Unicode Debug"
+# Name "odbc - Win32 DLL Release"
+# Name "odbc - Win32 DLL Debug"
+# Name "odbc - Win32 Universal Unicode Release"
+# Name "odbc - Win32 Universal Unicode Debug"
+# Name "odbc - Win32 Universal Release"
+# Name "odbc - Win32 Universal Debug"
+# Name "odbc - Win32 Unicode Release"
+# Name "odbc - Win32 Unicode Debug"
+# Name "odbc - Win32 Release"
+# Name "odbc - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -888,115 +472,59 @@ SOURCE=..\..\src\common\dummy.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1011,7 +539,7 @@ SOURCE=..\..\src\msw\version.rc
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1021,17 +549,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1041,27 +559,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1071,268 +569,136 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - 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)" == "odbc - 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)" == "odbc - 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)" == "odbc - 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)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_1"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-# Begin Custom Build - 
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-SOURCE=..\..\include\wx\msw\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build

 
 

-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_1"
+!ENDIF

 
 

-# Begin Custom Build - 
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\include\wx\msw\setup.h

 
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"

 
 

-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1342,17 +708,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1362,17 +718,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1382,17 +728,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1402,65 +738,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1470,17 +772,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1490,17 +782,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1510,17 +792,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1541,7 +813,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1550,25 +822,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1577,7 +831,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1586,25 +840,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1613,7 +849,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1622,25 +858,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1649,7 +867,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1658,25 +876,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1685,7 +885,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1694,25 +894,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1721,7 +903,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1730,25 +912,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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)" == "odbc - 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)" == "odbc - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1757,7 +921,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1766,25 +930,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - 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
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1793,7 +939,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1802,25 +948,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "odbc - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_qa.dsp b/build/msw/wx_qa.dsp
index 611fd8cdac7b012640b992791f6a33877a0c89ca..3da377b4dcd9cbf06a9bf725190add02c3c9e431 100644 (file)
--- a/build/msw/wx_qa.dsp
+++ b/build/msw/wx_qa.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=qa - Win32 Debug USE_AUI_0
+CFG=qa - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=qa - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_qa.mak" CFG="qa - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_qa.mak" CFG="qa - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "qa - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "qa - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "qa - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "qa - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "qa - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=qa - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\qa"
-# 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_qadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_qa_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_QA" /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_qadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_qa_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_QA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_qa_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_QA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_qa_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_QA
-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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.lib"
 
 # 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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.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\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_qa.lib"
 

-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\qa"
-# 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_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_qa_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_QA" /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_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_qa_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_QA" /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_QA" /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_QA" /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_qa_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_QA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_qa_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_QA
-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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.lib" /debug
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.lib" /debug
 
 # 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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.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\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_qa.lib" /debug
 

-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\qa"
-# 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_qadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_qa_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_QA" /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_qadll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_qa_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_QA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_qa_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_QA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_qa_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_QA
-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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.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\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_qa.lib"
 

-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\qa"
-# 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_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_qa_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_QA" /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_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_qa_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_QA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /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_qa_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_QA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_qa_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_QA
-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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.lib" /debug
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.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\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_qa.lib" /debug
 

-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\qa"
-# 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_qadll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_qa_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_QA" /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_qadll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_qa_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_QA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_qa_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_QA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_qa_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_QA
-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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.lib"
 
 # 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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.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\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u.lib ..\..\lib\vc_dll\wxbase27u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_qa.lib"
 

-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\qa"
-# 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_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_qa_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_QA" /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_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_qa_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_QA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /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_qa_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_QA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_qa_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_QA
-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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.lib" /debug
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.lib" /debug
 
 # 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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.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\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_qa.lib" /debug
 

-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\qa"
-# 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_qadll.pch" /Fd..\..\lib\vc_dll\wxmsw270_qa_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_QA" /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_qadll.pch" /Fd..\..\lib\vc_dll\wxmsw270_qa_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_QA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_qa_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_QA
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_qa_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_QA
-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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.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\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27.lib ..\..\lib\vc_dll\wxbase27_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_qa.lib"
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\qa"
-# 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_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_qa_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_QA" /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_qadll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_qa_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_QA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_qa_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_QA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_qa_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_QA
-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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.lib" /debug
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.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\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d.lib ..\..\lib\vc_dll\wxbase27d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_qa.lib" /debug
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,222 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\qa"
+# PROP BASE Intermediate_Dir "vc_mswunivud\qa"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\qa"
+# PROP Intermediate_Dir "vc_mswunivud\qa"

 # PROP Target_Dir ""
 # 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_qalib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_qalib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_qalib.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" /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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_qalib.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" /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 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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_qa.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_qa.lib"

 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\qa"
+# PROP BASE Intermediate_Dir "vc_mswuniv\qa"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\qa"
+# PROP Intermediate_Dir "vc_mswuniv\qa"

 # PROP Target_Dir ""
 # 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_qalib.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" /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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_qalib.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" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_qalib.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__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_qalib.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__" /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 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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_qa.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_qa.lib"

 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\qa"
+# PROP BASE Intermediate_Dir "vc_mswunivd\qa"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\qa"
+# PROP Intermediate_Dir "vc_mswunivd\qa"

 # PROP Target_Dir ""
 # 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_qalib.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" /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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_qalib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_qalib.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__" /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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_qalib.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__" /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 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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_qa.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_qa.lib"

 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\qa"
+# PROP BASE Intermediate_Dir "vc_mswu\qa"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\qa"
+# PROP Intermediate_Dir "vc_mswu\qa"

 # PROP Target_Dir ""
 # 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_qalib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_qalib.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__" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.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" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.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" /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 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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_qa.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_qa.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_qa.lib"

 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\qa"
+# PROP BASE Intermediate_Dir "vc_mswud\qa"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\qa"
-# 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_qalib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_qalib.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__" /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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\qa"
-# 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_qalib.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__" /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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_qalib.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__" /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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\qa"
-# 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_qalib.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__" /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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_qalib.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__" /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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\qa"
-# 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.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" /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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\qa"
-# 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_qalib.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" /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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - 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\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\qa"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\qa"
 # PROP Target_Dir ""


@@ -712,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\qa"
-# 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_qalib.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" /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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_qalib.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" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -758,53 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\qa"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_qalib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_qalib.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__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\qa"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\qa"
-# 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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_qalib.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__" /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_qa.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_qalib.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__" /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_qa.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_qa.lib"
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "qa - Win32 DLL Universal Release USE_AUI_1"
-# Name "qa - Win32 DLL Universal Release USE_AUI_0"
-# Name "qa - Win32 DLL Universal Debug USE_AUI_1"
-# Name "qa - Win32 DLL Universal Debug USE_AUI_0"
-# Name "qa - Win32 DLL Unicode Release USE_AUI_1"
-# Name "qa - Win32 DLL Unicode Release USE_AUI_0"
-# Name "qa - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "qa - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "qa - Win32 DLL Release USE_AUI_1"
-# Name "qa - Win32 DLL Release USE_AUI_0"
-# Name "qa - Win32 DLL Debug USE_AUI_1"
-# Name "qa - Win32 DLL Debug USE_AUI_0"
-# Name "qa - Win32 Universal Unicode Release USE_AUI_1"
-# Name "qa - Win32 Universal Unicode Release USE_AUI_0"
-# Name "qa - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "qa - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "qa - Win32 Universal Release USE_AUI_1"
-# Name "qa - Win32 Universal Release USE_AUI_0"
-# Name "qa - Win32 Universal Debug USE_AUI_1"
-# Name "qa - Win32 Universal Debug USE_AUI_0"
-# Name "qa - Win32 Unicode Release USE_AUI_1"
-# Name "qa - Win32 Unicode Release USE_AUI_0"
-# Name "qa - Win32 Unicode Debug USE_AUI_1"
-# Name "qa - Win32 Unicode Debug USE_AUI_0"
-# Name "qa - Win32 Release USE_AUI_1"
-# Name "qa - Win32 Release USE_AUI_0"
-# Name "qa - Win32 Debug USE_AUI_1"
-# Name "qa - Win32 Debug USE_AUI_0"
+# Name "qa - Win32 DLL Universal Unicode Release"
+# Name "qa - Win32 DLL Universal Unicode Debug"
+# Name "qa - Win32 DLL Universal Release"
+# Name "qa - Win32 DLL Universal Debug"
+# Name "qa - Win32 DLL Unicode Release"
+# Name "qa - Win32 DLL Unicode Debug"
+# Name "qa - Win32 DLL Release"
+# Name "qa - Win32 DLL Debug"
+# Name "qa - Win32 Universal Unicode Release"
+# Name "qa - Win32 Universal Unicode Debug"
+# Name "qa - Win32 Universal Release"
+# Name "qa - Win32 Universal Debug"
+# Name "qa - Win32 Unicode Release"
+# Name "qa - Win32 Unicode Debug"
+# Name "qa - Win32 Release"
+# Name "qa - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -884,115 +468,59 @@ SOURCE=..\..\src\common\dummy.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1015,7 +543,7 @@ SOURCE=..\..\src\generic\dbgrptg.cpp
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1025,17 +553,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1045,27 +563,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1075,268 +573,136 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - 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)" == "qa - 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)" == "qa - 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)" == "qa - 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)" == "qa - 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)" == "qa - 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)" == "qa - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_1"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-# Begin Custom Build - 
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-SOURCE=..\..\include\wx\msw\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build

 
 

-!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_1"
+!ENDIF

 
 

-# Begin Custom Build - 
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\include\wx\msw\setup.h

 
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug"

 
 

-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1346,17 +712,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1366,17 +722,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1386,17 +732,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1406,65 +742,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1474,17 +776,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1494,17 +786,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1514,17 +796,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1545,7 +817,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1554,25 +826,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1581,7 +835,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1590,25 +844,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1617,7 +853,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1626,25 +862,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1653,7 +871,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1662,25 +880,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1689,7 +889,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1698,25 +898,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1725,7 +907,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1734,25 +916,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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)" == "qa - 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)" == "qa - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1761,7 +925,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1770,25 +934,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - 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
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1797,7 +943,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "qa - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1806,25 +952,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "qa - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "qa - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "qa - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_wxexpat.dsp b/build/msw/wx_wxexpat.dsp
index 62c004378e4839cf34dbb924d1de286fdc7b8e9f..27c623f9223fe18b25fc3a9576a94a1ddff89bf4 100644 (file)
--- a/build/msw/wx_wxexpat.dsp
+++ b/build/msw/wx_wxexpat.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 

-CFG=wxexpat - Win32 Debug USE_AUI_0
+CFG=wxexpat - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -13,42 +13,26 @@ CFG=wxexpat - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_wxexpat.mak" CFG="wxexpat - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_wxexpat.mak" CFG="wxexpat - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxexpat - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxexpat - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -58,7 +42,7 @@ CFG=wxexpat - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -81,53 +65,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /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_dll\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - 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\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /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_dll\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -150,7 +88,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -173,53 +111,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /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_dll\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - 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\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /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_dll\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -242,7 +134,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -265,53 +157,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /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_dll\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - 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\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /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_dll\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -334,7 +180,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -357,53 +203,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /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_dll\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /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_dll\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -426,7 +226,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxexpatd.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -449,53 +249,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /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\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - 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\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /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\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -518,7 +272,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -541,53 +295,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /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\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - 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\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /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\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -610,7 +318,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -633,53 +341,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /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\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - 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\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /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\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -702,7 +364,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -725,53 +387,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
 

-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /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\wxexpat.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpat.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxexpat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxexpat"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /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\wxexpatd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxexpatd.lib"
-
-!ELSEIF  "$(CFG)" == "wxexpat - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxexpat - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -798,38 +414,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "wxexpat - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "wxexpat - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "wxexpat - Win32 DLL Universal Release USE_AUI_1"
-# Name "wxexpat - Win32 DLL Universal Release USE_AUI_0"
-# Name "wxexpat - Win32 DLL Universal Debug USE_AUI_1"
-# Name "wxexpat - Win32 DLL Universal Debug USE_AUI_0"
-# Name "wxexpat - Win32 DLL Unicode Release USE_AUI_1"
-# Name "wxexpat - Win32 DLL Unicode Release USE_AUI_0"
-# Name "wxexpat - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "wxexpat - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "wxexpat - Win32 DLL Release USE_AUI_1"
-# Name "wxexpat - Win32 DLL Release USE_AUI_0"
-# Name "wxexpat - Win32 DLL Debug USE_AUI_1"
-# Name "wxexpat - Win32 DLL Debug USE_AUI_0"
-# Name "wxexpat - Win32 Universal Unicode Release USE_AUI_1"
-# Name "wxexpat - Win32 Universal Unicode Release USE_AUI_0"
-# Name "wxexpat - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "wxexpat - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "wxexpat - Win32 Universal Release USE_AUI_1"
-# Name "wxexpat - Win32 Universal Release USE_AUI_0"
-# Name "wxexpat - Win32 Universal Debug USE_AUI_1"
-# Name "wxexpat - Win32 Universal Debug USE_AUI_0"
-# Name "wxexpat - Win32 Unicode Release USE_AUI_1"
-# Name "wxexpat - Win32 Unicode Release USE_AUI_0"
-# Name "wxexpat - Win32 Unicode Debug USE_AUI_1"
-# Name "wxexpat - Win32 Unicode Debug USE_AUI_0"
-# Name "wxexpat - Win32 Release USE_AUI_1"
-# Name "wxexpat - Win32 Release USE_AUI_0"
-# Name "wxexpat - Win32 Debug USE_AUI_1"
-# Name "wxexpat - Win32 Debug USE_AUI_0"
+# Name "wxexpat - Win32 DLL Universal Unicode Release"
+# Name "wxexpat - Win32 DLL Universal Unicode Debug"
+# Name "wxexpat - Win32 DLL Universal Release"
+# Name "wxexpat - Win32 DLL Universal Debug"
+# Name "wxexpat - Win32 DLL Unicode Release"
+# Name "wxexpat - Win32 DLL Unicode Debug"
+# Name "wxexpat - Win32 DLL Release"
+# Name "wxexpat - Win32 DLL Debug"
+# Name "wxexpat - Win32 Universal Unicode Release"
+# Name "wxexpat - Win32 Universal Unicode Debug"
+# Name "wxexpat - Win32 Universal Release"
+# Name "wxexpat - Win32 Universal Debug"
+# Name "wxexpat - Win32 Unicode Release"
+# Name "wxexpat - Win32 Unicode Debug"
+# Name "wxexpat - Win32 Release"
+# Name "wxexpat - Win32 Debug"

 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""

diff --git a/build/msw/wx_wxjpeg.dsp b/build/msw/wx_wxjpeg.dsp
index 20474d059800849b4187e5d3c837b5376191c00a..8d776b23962eb5ef04acfb74d088fd5e057bc02c 100644 (file)
--- a/build/msw/wx_wxjpeg.dsp
+++ b/build/msw/wx_wxjpeg.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 

-CFG=wxjpeg - Win32 Debug USE_AUI_0
+CFG=wxjpeg - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -13,42 +13,26 @@ CFG=wxjpeg - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_wxjpeg.mak" CFG="wxjpeg - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_wxjpeg.mak" CFG="wxjpeg - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -58,7 +42,7 @@ CFG=wxjpeg - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -81,53 +65,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /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_dll\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - 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\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -150,7 +88,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -173,53 +111,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswuniv" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswuniv" /D "WIN32" /D "_LIB" /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_dll\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - 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\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -242,7 +134,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -265,53 +157,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /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_dll\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - 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\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -334,7 +180,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -357,53 +203,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\msw" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\msw" /D "WIN32" /D "_LIB" /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_dll\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -426,7 +226,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -449,53 +249,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /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\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - 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\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -518,7 +272,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -541,53 +295,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswuniv" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswuniv" /D "WIN32" /D "_LIB" /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\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - 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\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -610,7 +318,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -633,53 +341,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /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\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - 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\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -702,7 +364,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -725,53 +387,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
 

-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\msw" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\msw" /D "WIN32" /D "_LIB" /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\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -798,38 +414,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "wxjpeg - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "wxjpeg - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "wxjpeg - Win32 DLL Universal Release USE_AUI_1"
-# Name "wxjpeg - Win32 DLL Universal Release USE_AUI_0"
-# Name "wxjpeg - Win32 DLL Universal Debug USE_AUI_1"
-# Name "wxjpeg - Win32 DLL Universal Debug USE_AUI_0"
-# Name "wxjpeg - Win32 DLL Unicode Release USE_AUI_1"
-# Name "wxjpeg - Win32 DLL Unicode Release USE_AUI_0"
-# Name "wxjpeg - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "wxjpeg - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "wxjpeg - Win32 DLL Release USE_AUI_1"
-# Name "wxjpeg - Win32 DLL Release USE_AUI_0"
-# Name "wxjpeg - Win32 DLL Debug USE_AUI_1"
-# Name "wxjpeg - Win32 DLL Debug USE_AUI_0"
-# Name "wxjpeg - Win32 Universal Unicode Release USE_AUI_1"
-# Name "wxjpeg - Win32 Universal Unicode Release USE_AUI_0"
-# Name "wxjpeg - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "wxjpeg - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "wxjpeg - Win32 Universal Release USE_AUI_1"
-# Name "wxjpeg - Win32 Universal Release USE_AUI_0"
-# Name "wxjpeg - Win32 Universal Debug USE_AUI_1"
-# Name "wxjpeg - Win32 Universal Debug USE_AUI_0"
-# Name "wxjpeg - Win32 Unicode Release USE_AUI_1"
-# Name "wxjpeg - Win32 Unicode Release USE_AUI_0"
-# Name "wxjpeg - Win32 Unicode Debug USE_AUI_1"
-# Name "wxjpeg - Win32 Unicode Debug USE_AUI_0"
-# Name "wxjpeg - Win32 Release USE_AUI_1"
-# Name "wxjpeg - Win32 Release USE_AUI_0"
-# Name "wxjpeg - Win32 Debug USE_AUI_1"
-# Name "wxjpeg - Win32 Debug USE_AUI_0"
+# Name "wxjpeg - Win32 DLL Universal Unicode Release"
+# Name "wxjpeg - Win32 DLL Universal Unicode Debug"
+# Name "wxjpeg - Win32 DLL Universal Release"
+# Name "wxjpeg - Win32 DLL Universal Debug"
+# Name "wxjpeg - Win32 DLL Unicode Release"
+# Name "wxjpeg - Win32 DLL Unicode Debug"
+# Name "wxjpeg - Win32 DLL Release"
+# Name "wxjpeg - Win32 DLL Debug"
+# Name "wxjpeg - Win32 Universal Unicode Release"
+# Name "wxjpeg - Win32 Universal Unicode Debug"
+# Name "wxjpeg - Win32 Universal Release"
+# Name "wxjpeg - Win32 Universal Debug"
+# Name "wxjpeg - Win32 Unicode Release"
+# Name "wxjpeg - Win32 Unicode Debug"
+# Name "wxjpeg - Win32 Release"
+# Name "wxjpeg - Win32 Debug"

 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""

diff --git a/build/msw/wx_wxpng.dsp b/build/msw/wx_wxpng.dsp
index c092a20c685b19ef944bf59e53cfbf20f378a1ff..0530292c01412040bd1926d7780f1340a479bfb0 100644 (file)
--- a/build/msw/wx_wxpng.dsp
+++ b/build/msw/wx_wxpng.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 

-CFG=wxpng - Win32 Debug USE_AUI_0
+CFG=wxpng - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -13,42 +13,26 @@ CFG=wxpng - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_wxpng.mak" CFG="wxpng - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_wxpng.mak" CFG="wxpng - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxpng - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxpng - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxpng - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -58,7 +42,7 @@ CFG=wxpng - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -81,53 +65,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /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_dll\wxpng.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - 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\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxpngd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -150,7 +88,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -173,53 +111,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /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_dll\wxpng.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - 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\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxpngd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -242,7 +134,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -265,53 +157,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /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_dll\wxpng.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - 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\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxpngd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -334,7 +180,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -357,53 +203,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /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_dll\wxpng.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxpngd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -426,7 +226,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -449,53 +249,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /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\wxpng.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - 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\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxpngd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -518,7 +272,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -541,53 +295,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /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\wxpng.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - 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\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxpngd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -610,7 +318,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -633,53 +341,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /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\wxpng.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - 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\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxpngd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -702,7 +364,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -725,53 +387,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
 

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /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\wxpng.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxpng"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxpng"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxpngd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"
-
-!ELSEIF  "$(CFG)" == "wxpng - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxpng - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -798,38 +414,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "wxpng - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "wxpng - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "wxpng - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "wxpng - Win32 DLL Universal Release USE_AUI_1"
-# Name "wxpng - Win32 DLL Universal Release USE_AUI_0"
-# Name "wxpng - Win32 DLL Universal Debug USE_AUI_1"
-# Name "wxpng - Win32 DLL Universal Debug USE_AUI_0"
-# Name "wxpng - Win32 DLL Unicode Release USE_AUI_1"
-# Name "wxpng - Win32 DLL Unicode Release USE_AUI_0"
-# Name "wxpng - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "wxpng - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "wxpng - Win32 DLL Release USE_AUI_1"
-# Name "wxpng - Win32 DLL Release USE_AUI_0"
-# Name "wxpng - Win32 DLL Debug USE_AUI_1"
-# Name "wxpng - Win32 DLL Debug USE_AUI_0"
-# Name "wxpng - Win32 Universal Unicode Release USE_AUI_1"
-# Name "wxpng - Win32 Universal Unicode Release USE_AUI_0"
-# Name "wxpng - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "wxpng - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "wxpng - Win32 Universal Release USE_AUI_1"
-# Name "wxpng - Win32 Universal Release USE_AUI_0"
-# Name "wxpng - Win32 Universal Debug USE_AUI_1"
-# Name "wxpng - Win32 Universal Debug USE_AUI_0"
-# Name "wxpng - Win32 Unicode Release USE_AUI_1"
-# Name "wxpng - Win32 Unicode Release USE_AUI_0"
-# Name "wxpng - Win32 Unicode Debug USE_AUI_1"
-# Name "wxpng - Win32 Unicode Debug USE_AUI_0"
-# Name "wxpng - Win32 Release USE_AUI_1"
-# Name "wxpng - Win32 Release USE_AUI_0"
-# Name "wxpng - Win32 Debug USE_AUI_1"
-# Name "wxpng - Win32 Debug USE_AUI_0"
+# Name "wxpng - Win32 DLL Universal Unicode Release"
+# Name "wxpng - Win32 DLL Universal Unicode Debug"
+# Name "wxpng - Win32 DLL Universal Release"
+# Name "wxpng - Win32 DLL Universal Debug"
+# Name "wxpng - Win32 DLL Unicode Release"
+# Name "wxpng - Win32 DLL Unicode Debug"
+# Name "wxpng - Win32 DLL Release"
+# Name "wxpng - Win32 DLL Debug"
+# Name "wxpng - Win32 Universal Unicode Release"
+# Name "wxpng - Win32 Universal Unicode Debug"
+# Name "wxpng - Win32 Universal Release"
+# Name "wxpng - Win32 Universal Debug"
+# Name "wxpng - Win32 Unicode Release"
+# Name "wxpng - Win32 Unicode Debug"
+# Name "wxpng - Win32 Release"
+# Name "wxpng - Win32 Debug"

 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""

diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp
index 92c62ae13c4c62df5f00d24a2a0ab85e7f2fb887..d8e904bd7b7bb6edc947bfbf2180fa66d951550f 100644 (file)
--- a/build/msw/wx_wxregex.dsp
+++ b/build/msw/wx_wxregex.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 

-CFG=wxregex - Win32 Debug USE_AUI_0
+CFG=wxregex - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -13,42 +13,26 @@ CFG=wxregex - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_wxregex.mak" CFG="wxregex - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_wxregex.mak" CFG="wxregex - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxregex - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxregex - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -58,7 +42,7 @@ CFG=wxregex - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -81,53 +65,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /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_dll\wxregexu.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /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_dll\wxregexud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -150,30 +88,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /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_dll\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -196,30 +111,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /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_dll\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -242,30 +134,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /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_dll\wxregexu.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -288,30 +157,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexu.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /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_dll\wxregexud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -334,30 +180,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexud.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /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_dll\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -380,30 +203,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregex.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /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_dll\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -426,30 +226,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxregexd.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /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\wxregexu.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -472,30 +249,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /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\wxregexud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -518,30 +272,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /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\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -564,30 +295,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /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\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -610,30 +318,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /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\wxregexu.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -656,30 +341,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexu.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - 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\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /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\wxregexud.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -702,7 +364,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexud.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -725,53 +387,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /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\wxregex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregex.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxregex"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxregex"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /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\wxregexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxregexd.lib"
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -798,38 +414,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "wxregex - Win32 DLL Universal Release USE_AUI_1"
-# Name "wxregex - Win32 DLL Universal Release USE_AUI_0"
-# Name "wxregex - Win32 DLL Universal Debug USE_AUI_1"
-# Name "wxregex - Win32 DLL Universal Debug USE_AUI_0"
-# Name "wxregex - Win32 DLL Unicode Release USE_AUI_1"
-# Name "wxregex - Win32 DLL Unicode Release USE_AUI_0"
-# Name "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "wxregex - Win32 DLL Release USE_AUI_1"
-# Name "wxregex - Win32 DLL Release USE_AUI_0"
-# Name "wxregex - Win32 DLL Debug USE_AUI_1"
-# Name "wxregex - Win32 DLL Debug USE_AUI_0"
-# Name "wxregex - Win32 Universal Unicode Release USE_AUI_1"
-# Name "wxregex - Win32 Universal Unicode Release USE_AUI_0"
-# Name "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "wxregex - Win32 Universal Release USE_AUI_1"
-# Name "wxregex - Win32 Universal Release USE_AUI_0"
-# Name "wxregex - Win32 Universal Debug USE_AUI_1"
-# Name "wxregex - Win32 Universal Debug USE_AUI_0"
-# Name "wxregex - Win32 Unicode Release USE_AUI_1"
-# Name "wxregex - Win32 Unicode Release USE_AUI_0"
-# Name "wxregex - Win32 Unicode Debug USE_AUI_1"
-# Name "wxregex - Win32 Unicode Debug USE_AUI_0"
-# Name "wxregex - Win32 Release USE_AUI_1"
-# Name "wxregex - Win32 Release USE_AUI_0"
-# Name "wxregex - Win32 Debug USE_AUI_1"
-# Name "wxregex - Win32 Debug USE_AUI_0"
+# Name "wxregex - Win32 DLL Universal Unicode Release"
+# Name "wxregex - Win32 DLL Universal Unicode Debug"
+# Name "wxregex - Win32 DLL Universal Release"
+# Name "wxregex - Win32 DLL Universal Debug"
+# Name "wxregex - Win32 DLL Unicode Release"
+# Name "wxregex - Win32 DLL Unicode Debug"
+# Name "wxregex - Win32 DLL Release"
+# Name "wxregex - Win32 DLL Debug"
+# Name "wxregex - Win32 Universal Unicode Release"
+# Name "wxregex - Win32 Universal Unicode Debug"
+# Name "wxregex - Win32 Universal Release"
+# Name "wxregex - Win32 Universal Debug"
+# Name "wxregex - Win32 Unicode Release"
+# Name "wxregex - Win32 Unicode Debug"
+# Name "wxregex - Win32 Release"
+# Name "wxregex - Win32 Debug"

 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""


@@ -857,16 +457,7 @@ SOURCE=..\..\src\regex\regfree.c
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -875,16 +466,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -893,16 +475,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -911,16 +484,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -929,16 +493,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -947,7 +502,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -956,25 +511,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -983,16 +520,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1001,16 +529,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1019,16 +538,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1037,16 +547,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1055,16 +556,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1073,7 +565,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1082,25 +574,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1109,7 +583,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1118,25 +592,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 


@@ -1152,7 +608,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1162,27 +618,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - 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)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1192,17 +628,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1212,17 +638,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1232,65 +648,31 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1300,17 +682,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1320,17 +692,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1340,17 +702,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1360,49 +712,25 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"

 
 # Begin Custom Build - 
 
 
 # Begin Custom Build - 
 


@@ -1415,65 +743,31 @@ InputPath=..\include\wx\univ\setup.h
 
 SOURCE=..\..\include\wx\msw\setup.h
 
 
 SOURCE=..\..\include\wx\msw\setup.h
 

-!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1483,17 +777,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1503,17 +787,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1523,17 +797,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1543,65 +807,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1611,17 +841,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1631,17 +851,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1651,17 +861,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "wxregex - 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)" == "wxregex - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h

diff --git a/build/msw/wx_wxtiff.dsp b/build/msw/wx_wxtiff.dsp
index efd3a5165b62d728c41f83aab1abcca9072fa290..4ba9593859678ddad63b1e42c8631be7472119ff 100644 (file)
--- a/build/msw/wx_wxtiff.dsp
+++ b/build/msw/wx_wxtiff.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 

-CFG=wxtiff - Win32 Debug USE_AUI_0
+CFG=wxtiff - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -13,42 +13,26 @@ CFG=wxtiff - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_wxtiff.mak" CFG="wxtiff - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_wxtiff.mak" CFG="wxtiff - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxtiff - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxtiff - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -58,7 +42,7 @@ CFG=wxtiff - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -81,53 +65,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /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_dll\wxtiff.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - 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\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxtiffd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -150,7 +88,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -173,53 +111,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /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_dll\wxtiff.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - 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\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxtiffd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -242,7 +134,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -265,53 +157,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /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_dll\wxtiff.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - 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\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxtiffd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -334,7 +180,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -357,53 +203,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /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_dll\wxtiff.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxtiffd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -426,7 +226,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -449,53 +249,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /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\wxtiff.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - 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\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxtiffd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -518,7 +272,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -541,53 +295,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /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\wxtiff.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - 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\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxtiffd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -610,7 +318,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -633,53 +341,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /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\wxtiff.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - 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\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxtiffd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -702,7 +364,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -725,53 +387,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
 

-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /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\wxtiff.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxtiff"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxtiff"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxtiffd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"
-
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -798,38 +414,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "wxtiff - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "wxtiff - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "wxtiff - Win32 DLL Universal Release USE_AUI_1"
-# Name "wxtiff - Win32 DLL Universal Release USE_AUI_0"
-# Name "wxtiff - Win32 DLL Universal Debug USE_AUI_1"
-# Name "wxtiff - Win32 DLL Universal Debug USE_AUI_0"
-# Name "wxtiff - Win32 DLL Unicode Release USE_AUI_1"
-# Name "wxtiff - Win32 DLL Unicode Release USE_AUI_0"
-# Name "wxtiff - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "wxtiff - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "wxtiff - Win32 DLL Release USE_AUI_1"
-# Name "wxtiff - Win32 DLL Release USE_AUI_0"
-# Name "wxtiff - Win32 DLL Debug USE_AUI_1"
-# Name "wxtiff - Win32 DLL Debug USE_AUI_0"
-# Name "wxtiff - Win32 Universal Unicode Release USE_AUI_1"
-# Name "wxtiff - Win32 Universal Unicode Release USE_AUI_0"
-# Name "wxtiff - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "wxtiff - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "wxtiff - Win32 Universal Release USE_AUI_1"
-# Name "wxtiff - Win32 Universal Release USE_AUI_0"
-# Name "wxtiff - Win32 Universal Debug USE_AUI_1"
-# Name "wxtiff - Win32 Universal Debug USE_AUI_0"
-# Name "wxtiff - Win32 Unicode Release USE_AUI_1"
-# Name "wxtiff - Win32 Unicode Release USE_AUI_0"
-# Name "wxtiff - Win32 Unicode Debug USE_AUI_1"
-# Name "wxtiff - Win32 Unicode Debug USE_AUI_0"
-# Name "wxtiff - Win32 Release USE_AUI_1"
-# Name "wxtiff - Win32 Release USE_AUI_0"
-# Name "wxtiff - Win32 Debug USE_AUI_1"
-# Name "wxtiff - Win32 Debug USE_AUI_0"
+# Name "wxtiff - Win32 DLL Universal Unicode Release"
+# Name "wxtiff - Win32 DLL Universal Unicode Debug"
+# Name "wxtiff - Win32 DLL Universal Release"
+# Name "wxtiff - Win32 DLL Universal Debug"
+# Name "wxtiff - Win32 DLL Unicode Release"
+# Name "wxtiff - Win32 DLL Unicode Debug"
+# Name "wxtiff - Win32 DLL Release"
+# Name "wxtiff - Win32 DLL Debug"
+# Name "wxtiff - Win32 Universal Unicode Release"
+# Name "wxtiff - Win32 Universal Unicode Debug"
+# Name "wxtiff - Win32 Universal Release"
+# Name "wxtiff - Win32 Universal Debug"
+# Name "wxtiff - Win32 Unicode Release"
+# Name "wxtiff - Win32 Unicode Debug"
+# Name "wxtiff - Win32 Release"
+# Name "wxtiff - Win32 Debug"

 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""

diff --git a/build/msw/wx_wxzlib.dsp b/build/msw/wx_wxzlib.dsp
index 60203927bc6bc0d2b6b4e7d8175c9377ed7833c8..795819e0b6a1a330d40a6a94e75bcb666b38c190 100644 (file)
--- a/build/msw/wx_wxzlib.dsp
+++ b/build/msw/wx_wxzlib.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 

-CFG=wxzlib - Win32 Debug USE_AUI_0
+CFG=wxzlib - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -13,42 +13,26 @@ CFG=wxzlib - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_wxzlib.mak" CFG="wxzlib - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_wxzlib.mak" CFG="wxzlib - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxzlib - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxzlib - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -58,7 +42,7 @@ CFG=wxzlib - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -81,53 +65,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /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_dll\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - 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\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -150,7 +88,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -173,53 +111,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /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_dll\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - 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\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -242,7 +134,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -265,53 +157,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /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_dll\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - 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\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -334,7 +180,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -357,53 +203,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /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_dll\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /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_dll\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -426,7 +226,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxzlibd.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -449,53 +249,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /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\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - 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\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -518,7 +272,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -541,53 +295,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /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\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - 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\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -610,7 +318,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -633,53 +341,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /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\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - 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\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -702,7 +364,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -725,53 +387,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
 

-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /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\wxzlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlib.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\wxzlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\wxzlib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /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\wxzlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxzlibd.lib"
-
-!ELSEIF  "$(CFG)" == "wxzlib - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "wxzlib - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -798,38 +414,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "wxzlib - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "wxzlib - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "wxzlib - Win32 DLL Universal Release USE_AUI_1"
-# Name "wxzlib - Win32 DLL Universal Release USE_AUI_0"
-# Name "wxzlib - Win32 DLL Universal Debug USE_AUI_1"
-# Name "wxzlib - Win32 DLL Universal Debug USE_AUI_0"
-# Name "wxzlib - Win32 DLL Unicode Release USE_AUI_1"
-# Name "wxzlib - Win32 DLL Unicode Release USE_AUI_0"
-# Name "wxzlib - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "wxzlib - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "wxzlib - Win32 DLL Release USE_AUI_1"
-# Name "wxzlib - Win32 DLL Release USE_AUI_0"
-# Name "wxzlib - Win32 DLL Debug USE_AUI_1"
-# Name "wxzlib - Win32 DLL Debug USE_AUI_0"
-# Name "wxzlib - Win32 Universal Unicode Release USE_AUI_1"
-# Name "wxzlib - Win32 Universal Unicode Release USE_AUI_0"
-# Name "wxzlib - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "wxzlib - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "wxzlib - Win32 Universal Release USE_AUI_1"
-# Name "wxzlib - Win32 Universal Release USE_AUI_0"
-# Name "wxzlib - Win32 Universal Debug USE_AUI_1"
-# Name "wxzlib - Win32 Universal Debug USE_AUI_0"
-# Name "wxzlib - Win32 Unicode Release USE_AUI_1"
-# Name "wxzlib - Win32 Unicode Release USE_AUI_0"
-# Name "wxzlib - Win32 Unicode Debug USE_AUI_1"
-# Name "wxzlib - Win32 Unicode Debug USE_AUI_0"
-# Name "wxzlib - Win32 Release USE_AUI_1"
-# Name "wxzlib - Win32 Release USE_AUI_0"
-# Name "wxzlib - Win32 Debug USE_AUI_1"
-# Name "wxzlib - Win32 Debug USE_AUI_0"
+# Name "wxzlib - Win32 DLL Universal Unicode Release"
+# Name "wxzlib - Win32 DLL Universal Unicode Debug"
+# Name "wxzlib - Win32 DLL Universal Release"
+# Name "wxzlib - Win32 DLL Universal Debug"
+# Name "wxzlib - Win32 DLL Unicode Release"
+# Name "wxzlib - Win32 DLL Unicode Debug"
+# Name "wxzlib - Win32 DLL Release"
+# Name "wxzlib - Win32 DLL Debug"
+# Name "wxzlib - Win32 Universal Unicode Release"
+# Name "wxzlib - Win32 Universal Unicode Debug"
+# Name "wxzlib - Win32 Universal Release"
+# Name "wxzlib - Win32 Universal Debug"
+# Name "wxzlib - Win32 Unicode Release"
+# Name "wxzlib - Win32 Unicode Debug"
+# Name "wxzlib - Win32 Release"
+# Name "wxzlib - Win32 Debug"

 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""

diff --git a/build/msw/wx_xml.dsp b/build/msw/wx_xml.dsp
index b4931de950df9a66f279f4b78c02bc6f62756105..fbd46ad0cfbcc9434261ab623f4a01e19ed58ca0 100644 (file)
--- a/build/msw/wx_xml.dsp
+++ b/build/msw/wx_xml.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=xml - Win32 Debug USE_AUI_0
+CFG=xml - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=xml - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_xml.mak" CFG="xml - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_xml.mak" CFG="xml - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "xml - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xml - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xml - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=xml - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\xml"
-# 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_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270u_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270u_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxbase270u_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
-# ADD LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 # ADD LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 
 # ADD BASE LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 # ADD LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 

-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\xml"
-# 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_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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=wxbase270ud_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
-# ADD LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 # ADD LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 # ADD LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 

-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\xml"
-# 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_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxbase270_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
-# ADD LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 # ADD LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 
 # ADD BASE LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 # ADD LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 

-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\xml"
-# 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_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxbase270d_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
-# ADD LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 # ADD LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 # ADD LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 

-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\xml"
-# 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_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270u_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270u_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxbase270u_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
-# ADD LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 # ADD LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 
 # ADD BASE LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 # ADD LINK32 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\wxbase270u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27u_xml.lib"
 

-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\xml"
-# 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_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxbase270ud_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
-# ADD LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 # ADD LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 # ADD LINK32 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\wxbase270ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27ud_xml.lib" /debug
 

-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\xml"
-# 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_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Fd..\..\lib\vc_dll\wxbase270_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxbase270_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
-# ADD LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 # ADD LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 
 # ADD BASE LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 # ADD LINK32 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\wxbase270_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27_xml.lib"
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\xml"
-# 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_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase270d_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxbase270d_xml_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
-# ADD LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 # ADD LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 
 # ADD BASE LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 # ADD LINK32 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\wxbase270d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase27d_xml.lib" /debug
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,222 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\xml"
+# PROP BASE Intermediate_Dir "vc_mswunivud\xml"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\xml"
+# PROP Intermediate_Dir "vc_mswunivud\xml"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.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_GUI=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\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.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_GUI=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 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\wxbase27u_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"

 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\xml"
+# PROP BASE Intermediate_Dir "vc_mswuniv\xml"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\xml"
+# PROP Intermediate_Dir "vc_mswuniv\xml"

 # PROP Target_Dir ""
 # 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\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.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_GUI=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\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.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_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.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_GUI=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 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\wxbase27ud_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"

 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\xml"
+# PROP BASE Intermediate_Dir "vc_mswunivd\xml"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\xml"
+# PROP Intermediate_Dir "vc_mswunivd\xml"

 # PROP Target_Dir ""
 # 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\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.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_GUI=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\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.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_GUI=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\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.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_GUI=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 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\wxbase27ud_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"

 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\xml"
+# PROP BASE Intermediate_Dir "vc_mswu\xml"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\xml"
+# PROP Intermediate_Dir "vc_mswu\xml"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.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_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.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_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.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_GUI=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 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\wxbase27_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"

 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\xml"
+# PROP BASE Intermediate_Dir "vc_mswud\xml"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\xml"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.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_GUI=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\wxbase27_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\xml"
-# 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\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.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_GUI=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\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.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_GUI=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\wxbase27d_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\xml"
-# 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\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.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_GUI=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\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.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_GUI=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\wxbase27d_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\xml"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.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_GUI=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\wxbase27u_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\xml"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.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_GUI=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\wxbase27u_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27u_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - 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\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\xml"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\xml"
 # PROP Target_Dir ""


@@ -712,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\xml"
-# 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\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.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_GUI=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\wxbase27ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.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_GUI=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\wxbase27ud_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27ud_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -758,53 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\xml"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.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_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase27_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.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_GUI=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\wxbase27_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\xml"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\xml"
-# 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\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.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_GUI=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\wxbase27d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.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_GUI=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\wxbase27d_xml.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase27d_xml.lib"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "xml - Win32 DLL Universal Release USE_AUI_1"
-# Name "xml - Win32 DLL Universal Release USE_AUI_0"
-# Name "xml - Win32 DLL Universal Debug USE_AUI_1"
-# Name "xml - Win32 DLL Universal Debug USE_AUI_0"
-# Name "xml - Win32 DLL Unicode Release USE_AUI_1"
-# Name "xml - Win32 DLL Unicode Release USE_AUI_0"
-# Name "xml - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "xml - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "xml - Win32 DLL Release USE_AUI_1"
-# Name "xml - Win32 DLL Release USE_AUI_0"
-# Name "xml - Win32 DLL Debug USE_AUI_1"
-# Name "xml - Win32 DLL Debug USE_AUI_0"
-# Name "xml - Win32 Universal Unicode Release USE_AUI_1"
-# Name "xml - Win32 Universal Unicode Release USE_AUI_0"
-# Name "xml - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "xml - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "xml - Win32 Universal Release USE_AUI_1"
-# Name "xml - Win32 Universal Release USE_AUI_0"
-# Name "xml - Win32 Universal Debug USE_AUI_1"
-# Name "xml - Win32 Universal Debug USE_AUI_0"
-# Name "xml - Win32 Unicode Release USE_AUI_1"
-# Name "xml - Win32 Unicode Release USE_AUI_0"
-# Name "xml - Win32 Unicode Debug USE_AUI_1"
-# Name "xml - Win32 Unicode Debug USE_AUI_0"
-# Name "xml - Win32 Release USE_AUI_1"
-# Name "xml - Win32 Release USE_AUI_0"
-# Name "xml - Win32 Debug USE_AUI_1"
-# Name "xml - Win32 Debug USE_AUI_0"
+# Name "xml - Win32 DLL Universal Unicode Release"
+# Name "xml - Win32 DLL Universal Unicode Debug"
+# Name "xml - Win32 DLL Universal Release"
+# Name "xml - Win32 DLL Universal Debug"
+# Name "xml - Win32 DLL Unicode Release"
+# Name "xml - Win32 DLL Unicode Debug"
+# Name "xml - Win32 DLL Release"
+# Name "xml - Win32 DLL Debug"
+# Name "xml - Win32 Universal Unicode Release"
+# Name "xml - Win32 Universal Unicode Debug"
+# Name "xml - Win32 Universal Release"
+# Name "xml - Win32 Universal Debug"
+# Name "xml - Win32 Unicode Release"
+# Name "xml - Win32 Unicode Debug"
+# Name "xml - Win32 Release"
+# Name "xml - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -884,115 +468,59 @@ SOURCE=..\..\src\common\xtixml.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1007,7 +535,7 @@ SOURCE=..\..\src\msw\version.rc
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1017,17 +545,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1037,27 +555,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1067,268 +565,136 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - 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)" == "xml - 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)" == "xml - 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)" == "xml - 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)" == "xml - 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)" == "xml - 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)" == "xml - Win32 DLL Universal Debug"

 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_1"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-# Begin Custom Build - 
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release"

 
 

-# Begin Custom Build - 
+# 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
 
 
 # End Custom Build
 

-!ENDIF
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug"

 
 

-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h

 
 

-SOURCE=..\..\include\wx\msw\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build

 
 

-!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_1"
+!ENDIF

 
 

-# Begin Custom Build - 
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\include\wx\msw\setup.h

 
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug"

 
 

-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+# Begin Custom Build - 

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1338,17 +704,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1358,17 +714,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1378,17 +724,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1398,65 +734,31 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1466,17 +768,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1486,17 +778,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1506,17 +788,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1537,7 +809,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1546,25 +818,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1573,7 +827,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1582,25 +836,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1609,7 +845,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1618,25 +854,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1645,7 +863,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1654,25 +872,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1681,7 +881,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1690,25 +890,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1717,7 +899,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1726,25 +908,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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)" == "xml - 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)" == "xml - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1753,7 +917,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1762,25 +926,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - 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
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1789,7 +935,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xml - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1798,25 +944,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xml - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xml - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 

diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp
index f83a99da0a17a66fd9ecd5639e43010699410ccd..0c46997f55b646e2a59ab02b59c97b9b50f353d6 100644 (file)
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

 
 

-CFG=xrc - Win32 Debug USE_AUI_0
+CFG=xrc - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 


@@ -14,42 +14,26 @@ CFG=xrc - Win32 Debug USE_AUI_0
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 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_xrc.mak" CFG="xrc - Win32 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_xrc.mak" CFG="xrc - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "xrc - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xrc - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "xrc - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xrc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xrc - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project


@@ -59,32 +43,7 @@ CFG=xrc - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\xrc"
-# 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_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_xrc_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_XRC" /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_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270u_xrc_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_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_xrc_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_XRC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_xrc_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_XRC
-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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -109,32 +68,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.lib"
 
 # 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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.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\wxmswuniv27u_html.lib ..\..\lib\vc_dll\wxmswuniv27u_adv.lib ..\..\lib\vc_dll\wxmswuniv27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_xrc.lib"
 

-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\xrc"
-# 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_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_xrc_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_XRC" /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_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270ud_xrc_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_XRC" /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_XRC" /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_XRC" /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_xrc_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_XRC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_xrc_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_XRC
-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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -159,32 +93,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.lib" /debug
 
 # 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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.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\wxmswuniv27ud_html.lib ..\..\lib\vc_dll\wxmswuniv27ud_adv.lib ..\..\lib\vc_dll\wxmswuniv27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_xrc.lib" /debug
 

-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\xrc"
-# 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_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_xrc_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_XRC" /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_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv270_xrc_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_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_xrc_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_XRC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_xrc_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_XRC
-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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -209,32 +118,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.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\wxmswuniv27_html.lib ..\..\lib\vc_dll\wxmswuniv27_adv.lib ..\..\lib\vc_dll\wxmswuniv27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_xrc.lib"
 

-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\xrc"
-# 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_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_xrc_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_XRC" /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_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv270d_xrc_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_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /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_xrc_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_XRC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_xrc_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_XRC
-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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -259,32 +143,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.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\wxmswuniv27d_html.lib ..\..\lib\vc_dll\wxmswuniv27d_adv.lib ..\..\lib\vc_dll\wxmswuniv27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_xrc.lib" /debug
 

-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\xrc"
-# 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_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_xrc_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_XRC" /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_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw270u_xrc_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_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_xrc_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_XRC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_xrc_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_XRC
-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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -309,32 +168,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.lib"
 
 # 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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.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\wxmsw27u_html.lib ..\..\lib\vc_dll\wxmsw27u_adv.lib ..\..\lib\vc_dll\wxmsw27u_core.lib ..\..\lib\vc_dll\wxbase27u_xml.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_xrc.lib"
 

-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\xrc"
-# 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_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_xrc_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_XRC" /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_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270ud_xrc_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_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /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_xrc_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_XRC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_xrc_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_XRC
-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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -359,32 +193,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.lib" /debug
 
 # 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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.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\wxmsw27ud_html.lib ..\..\lib\vc_dll\wxmsw27ud_adv.lib ..\..\lib\vc_dll\wxmsw27ud_core.lib ..\..\lib\vc_dll\wxbase27ud_xml.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_xrc.lib" /debug
 

-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\xrc"
-# 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_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw270_xrc_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_XRC" /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_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw270_xrc_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_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_xrc_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_XRC
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_xrc_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_XRC
-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\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.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\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -409,32 +218,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.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\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.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\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.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\wxmsw27_html.lib ..\..\lib\vc_dll\wxmsw27_adv.lib ..\..\lib\vc_dll\wxmsw27_core.lib ..\..\lib\vc_dll\wxbase27_xml.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_xrc.lib"
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\xrc"
-# 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_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_xrc_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_XRC" /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_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_xrc_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_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_xrc_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_XRC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_xrc_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_XRC
-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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -459,7 +243,7 @@ LINK32=link.exe
 # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.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\wxmsw27d_html.lib ..\..\lib\vc_dll\wxmsw27d_adv.lib ..\..\lib\vc_dll\wxmsw27d_core.lib ..\..\lib\vc_dll\wxbase27d_xml.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_xrc.lib" /debug
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -482,245 +266,107 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivu\xrc"
+# PROP BASE Intermediate_Dir "vc_mswunivud\xrc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivu\xrc"
+# PROP Intermediate_Dir "vc_mswunivud\xrc"

 # PROP Target_Dir ""
 # 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xrclib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xrclib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xrclib.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" /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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xrclib.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" /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 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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_xrc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_xrc.lib"

 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release"

 
 # PROP BASE Use_MFC 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 Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\xrc"
+# PROP BASE Intermediate_Dir "vc_mswuniv\xrc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # 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 Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\xrc"
+# PROP Intermediate_Dir "vc_mswuniv\xrc"

 # PROP Target_Dir ""
 # 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xrclib.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" /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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xrclib.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" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xrclib.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__" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xrclib.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__" /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 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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_xrc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_xrc.lib"

 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswunivud\xrc"
+# PROP BASE Intermediate_Dir "vc_mswunivd\xrc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswunivud\xrc"
+# PROP Intermediate_Dir "vc_mswunivd\xrc"

 # PROP Target_Dir ""
 # 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xrclib.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" /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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xrclib.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" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xrclib.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__" /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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xrclib.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__" /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 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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_xrc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_xrc.lib"

 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\xrc"
+# PROP BASE Intermediate_Dir "vc_mswu\xrc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"

-# PROP Intermediate_Dir "vc_mswuniv\xrc"
+# PROP Intermediate_Dir "vc_mswu\xrc"

 # PROP Target_Dir ""
 # 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xrclib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xrclib.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__" /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.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" /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.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" /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 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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_xrc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_xrc.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_xrc.lib"

 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug"

 
 # PROP BASE Use_MFC 0
 
 # PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "..\..\lib\vc_lib"
 # PROP BASE Output_Dir "..\..\lib\vc_lib"

-# PROP BASE Intermediate_Dir "vc_mswuniv\xrc"
+# PROP BASE Intermediate_Dir "vc_mswud\xrc"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\xrc"
-# 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xrclib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xrclib.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__" /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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\xrc"
-# 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xrclib.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__" /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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xrclib.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__" /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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\xrc"
-# 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xrclib.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__" /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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xrclib.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__" /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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\xrc"
-# 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.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" /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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\xrc"
-# 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.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" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xrclib.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" /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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - 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\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\xrc"
-# 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xrclib.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" /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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xrclib.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" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\xrc"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\xrc"
 # PROP Target_Dir ""


@@ -735,30 +381,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_xrc.lib"
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xrclib.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__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xrclib.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__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -781,30 +404,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
 
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_xrc.lib"
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\xrc"
-# 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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xrclib.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__" /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_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xrclib.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__" /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_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "xrc - Win32 DLL Universal Release USE_AUI_1"
-# Name "xrc - Win32 DLL Universal Release USE_AUI_0"
-# Name "xrc - Win32 DLL Universal Debug USE_AUI_1"
-# Name "xrc - Win32 DLL Universal Debug USE_AUI_0"
-# Name "xrc - Win32 DLL Unicode Release USE_AUI_1"
-# Name "xrc - Win32 DLL Unicode Release USE_AUI_0"
-# Name "xrc - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "xrc - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "xrc - Win32 DLL Release USE_AUI_1"
-# Name "xrc - Win32 DLL Release USE_AUI_0"
-# Name "xrc - Win32 DLL Debug USE_AUI_1"
-# Name "xrc - Win32 DLL Debug USE_AUI_0"
-# Name "xrc - Win32 Universal Unicode Release USE_AUI_1"
-# Name "xrc - Win32 Universal Unicode Release USE_AUI_0"
-# Name "xrc - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "xrc - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "xrc - Win32 Universal Release USE_AUI_1"
-# Name "xrc - Win32 Universal Release USE_AUI_0"
-# Name "xrc - Win32 Universal Debug USE_AUI_1"
-# Name "xrc - Win32 Universal Debug USE_AUI_0"
-# Name "xrc - Win32 Unicode Release USE_AUI_1"
-# Name "xrc - Win32 Unicode Release USE_AUI_0"
-# Name "xrc - Win32 Unicode Debug USE_AUI_1"
-# Name "xrc - Win32 Unicode Debug USE_AUI_0"
-# Name "xrc - Win32 Release USE_AUI_1"
-# Name "xrc - Win32 Release USE_AUI_0"
-# Name "xrc - Win32 Debug USE_AUI_1"
-# Name "xrc - Win32 Debug USE_AUI_0"
+# Name "xrc - Win32 DLL Universal Unicode Release"
+# Name "xrc - Win32 DLL Universal Unicode Debug"
+# Name "xrc - Win32 DLL Universal Release"
+# Name "xrc - Win32 DLL Universal Debug"
+# Name "xrc - Win32 DLL Unicode Release"
+# Name "xrc - Win32 DLL Unicode Debug"
+# Name "xrc - Win32 DLL Release"
+# Name "xrc - Win32 DLL Debug"
+# Name "xrc - Win32 Universal Unicode Release"
+# Name "xrc - Win32 Universal Unicode Debug"
+# Name "xrc - Win32 Universal Release"
+# Name "xrc - Win32 Universal Debug"
+# Name "xrc - Win32 Unicode Release"
+# Name "xrc - Win32 Unicode Debug"
+# Name "xrc - Win32 Release"
+# Name "xrc - Win32 Debug"

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -880,115 +464,59 @@ SOURCE=..\..\src\common\dummy.cpp
 
 SOURCE=..\..\src\msw\version.rc
 
 
 SOURCE=..\..\src\msw\version.rc
 

-!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_1"
+!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug"

 
 
 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release"

 
 

-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug"

 
 

-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_0"

 
 

-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"

 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"

 
 

-# PROP Exclude_From_Build 1

 
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Release"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Debug"

 
 # PROP Exclude_From_Build 1
 
 
 # PROP Exclude_From_Build 1
 


@@ -1003,65 +531,31 @@ SOURCE=..\..\src\msw\version.rc
 
 SOURCE=..\..\include\wx\msw\setup.h
 
 
 SOURCE=..\..\include\wx\msw\setup.h
 

-!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1071,17 +565,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1091,17 +575,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1111,17 +585,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1131,105 +595,51 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 
 # 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)" == "xrc - 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)" == "xrc - 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
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug"

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h

 InputPath=..\include\wx\msw\setup.h
 
 InputPath=..\include\wx\msw\setup.h
 

-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h

 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1239,17 +649,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h


@@ -1266,7 +666,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\univ\setup.h
 
 
 SOURCE=..\..\include\wx\univ\setup.h
 

-!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1276,27 +676,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - 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)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1306,17 +686,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1326,17 +696,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1346,65 +706,31 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1414,17 +740,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1434,17 +750,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1454,17 +760,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h


@@ -1474,49 +770,25 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Release"

 
 # Begin Custom Build - 
 
 # End Custom Build
 
 
 # Begin Custom Build - 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Debug"

 
 # Begin Custom Build - 
 
 
 # Begin Custom Build - 
 


@@ -1533,7 +805,7 @@ InputPath=..\include\wx\univ\setup.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 

-!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 


@@ -1542,25 +814,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - 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)" == "xrc - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 


@@ -1569,7 +823,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 


@@ -1578,25 +832,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - 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)" == "xrc - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 


@@ -1605,7 +841,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 


@@ -1614,25 +850,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - 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)" == "xrc - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 


@@ -1641,7 +859,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 


@@ -1650,25 +868,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - 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)" == "xrc - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 


@@ -1677,7 +877,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 


@@ -1686,25 +886,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - 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)" == "xrc - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 


@@ -1713,7 +895,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 


@@ -1722,25 +904,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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)" == "xrc - 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)" == "xrc - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 


@@ -1749,7 +913,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 


@@ -1758,25 +922,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - 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
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 


@@ -1785,7 +931,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Release"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 


@@ -1794,25 +940,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
 
 # End Custom Build
 

-!ELSEIF  "$(CFG)" == "xrc - Win32 Release USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "xrc - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "xrc - Win32 Debug"

 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h