move variable definitions to more appropriate places, remove now-empty src/common...

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

diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index 387e2d3b3afdc1ace7f62232292f47027a22f8f0..7cd4f59bc1a79f08d79eae7a1ebc650670505485 100644 (file)
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -18,20 +18,12 @@ CFG=adv - Win32 Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "adv - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "adv - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "adv - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "adv - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "adv - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "adv - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "adv - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "adv - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "adv - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "adv - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "adv - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "adv - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "adv - Win32 Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "adv - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "adv - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "adv - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
@@ -43,32 +35,32 @@ CFG=adv - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswunivudll\adv"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\adv"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb"\r
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -80,95 +72,45 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\adv"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\adv"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\adv"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=0 /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=0 /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_adv.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_adv.lib"\r
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb"\r
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivddll\adv"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivddll\adv"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=0 /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=0 /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_adv.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_adv.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswudll\adv"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\adv"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb"\r
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -180,83 +122,33 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\adv"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb"\r
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb"\r
 \r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\adv"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswdll\adv"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw290_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_advdll.pch" /Fd..\..\lib\vc_dll\wxmsw290_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d wxUSE_UNICODE=0 /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d wxUSE_UNICODE=0 /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_adv.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_adv.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\adv"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswddll\adv"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_advdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=0 /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=0 /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_adv.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_adv.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\adv"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\adv"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_adv.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_adv.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -266,7 +158,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_adv.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_adv.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -278,8 +170,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\adv"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -289,66 +181,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_adv.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_adv.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\adv"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswuniv\adv"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_adv.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_adv.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivd\adv"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivd\adv"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_adv.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_adv.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswu\adv"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\adv"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_adv.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_adv.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -358,7 +204,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_adv.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_adv.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -370,8 +216,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\adv"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -381,70 +227,16 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_adv.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_adv.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_msw\adv"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_msw\adv"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_adv.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_adv.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswd\adv"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswd\adv"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_adv.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_advlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=0 /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_adv.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_adv.lib"\r
-\r
 !ENDIF\r
 \r
 # Begin Target\r
 \r
-# Name "adv - Win32 DLL Universal Unicode Release"\r
-# Name "adv - Win32 DLL Universal Unicode Debug"\r
 # Name "adv - Win32 DLL Universal Release"\r
 # Name "adv - Win32 DLL Universal Debug"\r
-# Name "adv - Win32 DLL Unicode Release"\r
-# Name "adv - Win32 DLL Unicode Debug"\r
 # Name "adv - Win32 DLL Release"\r
 # Name "adv - Win32 DLL Debug"\r
-# Name "adv - Win32 Universal Unicode Release"\r
-# Name "adv - Win32 Universal Unicode Debug"\r
 # Name "adv - Win32 Universal Release"\r
 # Name "adv - Win32 Universal Debug"\r
-# Name "adv - Win32 Unicode Release"\r
-# Name "adv - Win32 Unicode Debug"\r
 # Name "adv - Win32 Release"\r
 # Name "adv - Win32 Debug"\r
 # Begin Group "Common Sources"\r
@@ -456,6 +248,14 @@ SOURCE=..\..\src\common\animatecmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\bmpcboxcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\calctrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\datavcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -466,10 +266,18 @@ SOURCE=..\..\src\common\dummy.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\gridcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\hyperlnkcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\odcombocmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\taskbarcmn.cpp\r
 # End Source File\r
 # End Group\r
@@ -482,57 +290,64 @@ SOURCE=..\..\src\msw\aboutdlg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\datectrl.cpp\r
+SOURCE=..\..\src\msw\bmpcbox.cpp\r
 \r
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\msw\calctrl.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
@@ -545,141 +360,175 @@ SOURCE=..\..\src\msw\datectrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\joystick.cpp\r
-# End Source File\r
-# Begin Source File\r
+SOURCE=..\..\src\msw\commandlinkbutton.cpp\r
 \r
-SOURCE=..\..\src\msw\sound.cpp\r
-# End Source File\r
-# Begin Source File\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
-SOURCE=..\..\src\msw\taskbar.cpp\r
-# End Source File\r
-# Begin Source File\r
+# PROP Exclude_From_Build 1\r
 \r
-SOURCE=..\..\src\msw\version.rc\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
+!ENDIF\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\msw\datecontrols.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
 !ENDIF\r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Generic Sources"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\aboutdlgg.cpp\r
-# End Source File\r
-# Begin Source File\r
+SOURCE=..\..\src\msw\datectrl.cpp\r
 \r
-SOURCE=..\..\src\generic\animateg.cpp\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
+!ENDIF\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\msw\hyperlink.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"\r
+SOURCE=..\..\src\msw\joystick.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\msw\notifmsg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
+SOURCE=..\..\src\msw\sound.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\taskbar.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\version.rc\r
 \r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
 !ENDIF\r
 \r
+# End Source File\r
+# End Group\r
+# Begin Group "Generic Sources"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\aboutdlgg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\animateg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -687,7 +536,11 @@ SOURCE=..\..\src\generic\bmpcboxg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\calctrl.cpp\r
+SOURCE=..\..\src\generic\calctrlg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\commandlinkbuttong.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -711,6 +564,10 @@ SOURCE=..\..\src\generic\gridctrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\generic\grideditors.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\generic\gridsel.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -727,6 +584,10 @@ SOURCE=..\..\src\generic\laywin.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\generic\notifmsgg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\generic\odcombo.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -757,19 +618,7 @@ SOURCE=..\..\src\generic\wizard.cpp
 \r
 SOURCE=..\..\include\wx\msw\setup.h\r
 \r
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
 # Begin Custom Build - \r
 \r
@@ -781,7 +630,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -791,7 +640,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -801,38 +650,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
 # Begin Custom Build - \r
@@ -845,7 +662,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -855,7 +672,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -865,26 +682,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
 !ENDIF\r
 \r
 # End Source File\r
@@ -892,7 +689,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 SOURCE=..\..\include\wx\univ\setup.h\r
 \r
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
@@ -902,7 +699,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
@@ -912,38 +709,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
 # Begin Custom Build - \r
@@ -956,7 +721,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
@@ -966,7 +731,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
@@ -976,38 +741,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
 # Begin Custom Build - \r
@@ -1029,13 +762,25 @@ InputPath=..\..\include\wx\univ\setup.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\bmpcbox.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\calctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\commandlinkbutton.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\datectrl.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\msw\genrcdefs.h\r
 \r
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -1045,7 +790,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -1055,27 +800,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -1085,7 +810,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -1095,27 +820,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -1125,7 +830,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -1135,27 +840,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -1165,7 +850,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -1175,35 +860,23 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
 !ENDIF\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\hyperlink.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\joystick.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\notifmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\sound.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1228,7 +901,7 @@ SOURCE=..\..\include\wx\generic\bmpcbox.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\generic\calctrl.h\r
+SOURCE=..\..\include\wx\generic\calctrlg.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1240,6 +913,14 @@ SOURCE=..\..\include\wx\generic\datectrl.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\generic\dvrenderer.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\dvrenderers.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\generic\grid.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1248,6 +929,10 @@ SOURCE=..\..\include\wx\generic\gridctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\generic\grideditors.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\generic\gridsel.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1264,6 +949,10 @@ SOURCE=..\..\include\wx\generic\laywin.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\generic\notifmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\generic\propdlg.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1292,15 +981,15 @@ SOURCE=..\..\include\wx\animate.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\animdecod.h\r
+SOURCE=..\..\include\wx\bmpcbox.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\bmpcbox.h\r
+SOURCE=..\..\include\wx\calctrl.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\calctrl.h\r
+SOURCE=..\..\include\wx\commandlinkbutton.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1320,6 +1009,10 @@ SOURCE=..\..\include\wx\dcbuffer.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\dvrenderers.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\editlbox.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1340,6 +1033,10 @@ SOURCE=..\..\include\wx\laywin.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\notifmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\odcombo.h\r
 # End Source File\r
 # Begin Source File\r