Fix a crash in wxExecute() in wxMSW too.

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

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 5e2b1e78b25dfa7ec8336bef5bb17cd634ccfa77..3b0161a7f73eb9598dcf173b85b10cb8a238ced2 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -18,20 +18,12 @@ CFG=base - Win32 Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r

-!MESSAGE "base - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "base - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r

 !MESSAGE "base - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "base - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "base - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "base - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")\r

-!MESSAGE "base - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "base - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r

 !MESSAGE "base - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "base - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "base - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "base - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r

-!MESSAGE "base - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "base - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r

 !MESSAGE "base - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "base - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "base - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "base - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r

-!MESSAGE "base - Win32 Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "base - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")\r

 !MESSAGE "base - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "base - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 !MESSAGE "base - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "base - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r


@@ -43,32 +35,32 @@ CFG=base - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r

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

 \r
 # PROP BASE Use_MFC 0\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\base"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswunivudll\base"\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\base"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\base"\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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase290u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase290u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase290u_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290u_vc_custom /i "..\..\src\tiff\libtiff" /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\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase295u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase295u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase295u_vc_custom /i "..\..\src\tiff\libtiff" /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\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase295u_vc_custom /i "..\..\src\tiff\libtiff" /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\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
+# 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 wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase295u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r
+# 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 wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase295u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r

 \r
 \r

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

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\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\base"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\base"\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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase290ud_vc_custom /i "..\..\src\tiff\libtiff" /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\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=wxbase290ud_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "base - 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\base"\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\base"\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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase290_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 "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase290_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 "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290_vc_custom /i "..\..\src\tiff\libtiff" /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\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase295ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase295ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase295ud_vc_custom /i "..\..\src\tiff\libtiff" /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\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase295ud_vc_custom /i "..\..\src\tiff\libtiff" /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\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
+# 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 wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase295ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r
+# 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 wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase295ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "base - 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
 \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\base"\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\base"\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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290d_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 "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290d_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 "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290d_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290d_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "base - 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\base"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP BASE Intermediate_Dir "vc_mswudll\base"\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\base"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\base"\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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase290u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase290u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290u_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290u_vc_custom /i "..\..\src\tiff\libtiff" /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\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase295u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase295u_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase295u_vc_custom /i "..\..\src\tiff\libtiff" /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\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase295u_vc_custom /i "..\..\src\tiff\libtiff" /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\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
+# 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 wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase295u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r
+# 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 wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase295u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\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\base"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\base"\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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase290ud_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290ud_vc_custom /i "..\..\src\tiff\libtiff" /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\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase295ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase295ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase295ud_vc_custom /i "..\..\src\tiff\libtiff" /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\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase295ud_vc_custom /i "..\..\src\tiff\libtiff" /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\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Release"\r
+# 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 wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase295ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r
+# 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 wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase295ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r

 \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\base"\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\base"\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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase290_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 "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Fd..\..\lib\vc_dll\wxbase290_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 "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Release"\r

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\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\base"\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\base"\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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290d_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 "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290d_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 "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290d_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290d_vc_custom /i "..\..\src\tiff\libtiff" /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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
-# 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "base - 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\base"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\base"\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\base"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\base"\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\wxbase29u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\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\wxbase29u.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u.lib"\r
 \r
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u.lib"\r
 \r

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

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\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\base"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\base"\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\wxbase29ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\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\wxbase29ud.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud.lib"\r
 \r
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud.lib"\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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\base"\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\base"\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\wxbase29.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.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 "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.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 "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "base - 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
 \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\base"\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\base"\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\wxbase29d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.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 "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.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 "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29d.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29d.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "base - 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\base"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP BASE Intermediate_Dir "vc_mswu\base"\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\base"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\base"\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\wxbase29u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29u.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\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\wxbase29u.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u.lib"\r
 \r
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u.lib"\r
 \r

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

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\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\base"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\base"\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\wxbase29ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxbase29ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.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" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\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\wxbase29ud.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud.lib"\r
 \r
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud.lib"\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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\base"\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\base"\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\wxbase29.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.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 "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.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 "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "base - 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\base"\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\base"\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\wxbase29d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.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 "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.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 "WXBUILDING" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /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\wxbase29d.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29d.lib"\r
-\r

 !ENDIF\r
 \r
 # Begin Target\r
 \r
 !ENDIF\r
 \r
 # Begin Target\r
 \r

-# Name "base - Win32 DLL Universal Unicode Release"\r
-# Name "base - Win32 DLL Universal Unicode Debug"\r

 # Name "base - Win32 DLL Universal Release"\r
 # Name "base - Win32 DLL Universal Debug"\r
 # Name "base - Win32 DLL Universal Release"\r
 # Name "base - Win32 DLL Universal Debug"\r

-# Name "base - Win32 DLL Unicode Release"\r
-# Name "base - Win32 DLL Unicode Debug"\r

 # Name "base - Win32 DLL Release"\r
 # Name "base - Win32 DLL Debug"\r
 # Name "base - Win32 DLL Release"\r
 # Name "base - Win32 DLL Debug"\r

-# Name "base - Win32 Universal Unicode Release"\r
-# Name "base - Win32 Universal Unicode Debug"\r

 # Name "base - Win32 Universal Release"\r
 # Name "base - Win32 Universal Debug"\r
 # Name "base - Win32 Universal Release"\r
 # Name "base - Win32 Universal Debug"\r

-# Name "base - Win32 Unicode Release"\r
-# Name "base - Win32 Unicode Debug"\r

 # Name "base - Win32 Release"\r
 # Name "base - Win32 Debug"\r
 # Begin Group "Common Sources"\r
 # Name "base - Win32 Release"\r
 # Name "base - Win32 Debug"\r
 # Begin Group "Common Sources"\r


@@ -452,6 +244,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\any.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\appbase.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\appbase.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -496,6 +292,10 @@ SOURCE=..\..\src\common\datetime.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\datetimefmt.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\datstrm.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\datstrm.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -591,6 +391,10 @@ SOURCE=..\..\src\common\fs_mem.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\fswatchercmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\hash.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\hash.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -611,6 +415,10 @@ SOURCE=..\..\src\common\ipcbase.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\languageinfo.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\list.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\list.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -643,6 +451,10 @@ SOURCE=..\..\src\common\mstream.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\numformatter.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\object.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\object.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -671,6 +483,10 @@ SOURCE=..\..\src\common\stdpbase.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\stdstream.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\stopwatch.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\stopwatch.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -715,6 +531,10 @@ SOURCE=..\..\src\common\textfile.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\time.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\timercmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\timercmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -727,6 +547,10 @@ SOURCE=..\..\src\common\tokenzr.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\translation.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\txtstrm.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\txtstrm.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -739,6 +563,10 @@ SOURCE=..\..\src\common\uri.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\ustring.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\utilscmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\utilscmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -759,6 +587,10 @@ SOURCE=..\..\src\common\wxprintf.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\xlocale.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\xti.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\xti.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -803,7 +635,11 @@ SOURCE=..\..\src\msw\dlmsw.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\evtloop.cpp\r
+SOURCE=..\..\src\msw\evtloopconsole.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\fswatcher.cpp\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -861,38 +697,18 @@ SOURCE=..\..\src\msw\utilsexc.cpp
 \r
 SOURCE=..\..\src\msw\version.rc\r
 \r
 \r
 SOURCE=..\..\src\msw\version.rc\r
 \r

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

 \r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"\r
 \r
 \r
 \r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"\r
 \r
 \r

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"\r
-\r
-\r

 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r
 \r
 \r

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r

 !ELSEIF  "$(CFG)" == "base - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -901,14 +717,6 @@ SOURCE=..\..\src\msw\version.rc
 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r

 !ELSEIF  "$(CFG)" == "base - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 !ELSEIF  "$(CFG)" == "base - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -925,26 +733,22 @@ SOURCE=..\..\src\msw\version.rc
 SOURCE=..\..\src\msw\volume.cpp\r
 # End Source File\r
 # End Group\r
 SOURCE=..\..\src\msw\volume.cpp\r
 # End Source File\r
 # End Group\r

-# Begin Group "Setup Headers"\r
+# Begin Group "Generic Sources"\r

 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\setup.h\r
-\r
-!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"\r
+SOURCE=..\..\src\generic\fswatcherg.cpp\r
+# End Source File\r
+# End Group\r
+# Begin Group "Setup Headers"\r

 \r
 \r

-# Begin Custom Build - \r
+# PROP Default_Filter ""\r
+# Begin Source File\r

 \r
 \r

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

 \r
 \r

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "base - Win32 DLL Universal Release"\r

 \r
 # Begin Custom Build - \r
 \r
 \r
 # Begin Custom Build - \r
 \r


@@ -956,7 +760,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

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

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


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

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r

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


@@ -976,38 +780,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r

 !ELSEIF  "$(CFG)" == "base - Win32 Universal Release"\r
 \r
 # Begin Custom Build - \r
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Release"\r
 \r
 # Begin Custom Build - \r


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

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

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


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

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

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


@@ -1040,26 +812,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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
 !ENDIF\r
 \r
 # End Source File\r


@@ -1067,7 +819,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 SOURCE=..\..\include\wx\univ\setup.h\r
 \r
 \r
 SOURCE=..\..\include\wx\univ\setup.h\r
 \r

-!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "base - 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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r


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

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "base - 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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r


@@ -1087,38 +839,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r

 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"\r
 \r
 # Begin Custom Build - \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"\r
 \r
 # Begin Custom Build - \r


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

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

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


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

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

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


@@ -1151,38 +871,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r

 !ELSEIF  "$(CFG)" == "base - Win32 Release"\r
 \r
 # Begin Custom Build - \r
 !ELSEIF  "$(CFG)" == "base - Win32 Release"\r
 \r
 # Begin Custom Build - \r


@@ -1228,13 +916,21 @@ SOURCE=..\..\include\wx\msw\debughlp.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\evtloopconsole.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\fswatcher.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\gccpriv.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\msw\genrcdefs.h\r
 \r
 SOURCE=..\..\include\wx\msw\gccpriv.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\msw\genrcdefs.h\r
 \r

-!IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "base - 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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


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

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "base - 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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -1254,27 +950,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "base - 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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -1284,7 +960,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "base - 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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -1294,27 +970,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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)" == "base - Win32 Universal Unicode Release"\r
+!ELSEIF  "$(CFG)" == "base - 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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -1324,7 +980,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "base - 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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -1334,27 +990,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

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

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


@@ -1364,7 +1000,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

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

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


@@ -1374,26 +1010,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "base - 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)" == "base - 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
 !ENDIF\r
 \r
 # End Source File\r


@@ -1450,6 +1066,14 @@ SOURCE=..\..\include\wx\msw\wrapcdlg.h
 SOURCE=..\..\include\wx\msw\wrapwin.h\r
 # End Source File\r
 # End Group\r
 SOURCE=..\..\include\wx\msw\wrapwin.h\r
 # End Source File\r
 # End Group\r

+# Begin Group "Generic Headers"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\fswatcher.h\r
+# End Source File\r
+# End Group\r

 # Begin Group "wxHTML Headers"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Group "wxHTML Headers"\r
 \r
 # PROP Default_Filter ""\r


@@ -1467,6 +1091,14 @@ SOURCE=..\..\include\wx\afterstd.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\any.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\anystr.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\app.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\app.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1507,6 +1139,10 @@ SOURCE=..\..\include\wx\chartype.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\checkeddelete.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\chkconf.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\chkconf.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1515,6 +1151,10 @@ SOURCE=..\..\include\wx\clntdata.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\cmdargs.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\cmdline.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\cmdline.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1535,6 +1175,10 @@ SOURCE=..\..\include\wx\convauto.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\meta\convertible.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\cpp.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\cpp.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1571,6 +1215,10 @@ SOURCE=..\..\include\wx\dlimpexp.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\dlist.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\dynarray.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\dynarray.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1591,6 +1239,14 @@ SOURCE=..\..\include\wx\event.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\eventfilter.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\evtloop.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\except.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\except.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1651,6 +1307,10 @@ SOURCE=..\..\include\wx\fs_zip.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\fswatcher.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\hash.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\hash.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1667,10 +1327,22 @@ SOURCE=..\..\include\wx\iconloc.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\meta\if.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\meta\implicitconversion.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\init.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\init.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\meta\int2type.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\intl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\intl.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1691,6 +1363,14 @@ SOURCE=..\..\include\wx\ipcbase.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\kbdstate.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\language.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\link.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\link.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1731,14 +1411,30 @@ SOURCE=..\..\include\wx\module.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\mousestate.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\meta\movable.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msgout.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\msgout.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msgqueue.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\mstream.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\mstream.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\numformatter.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\object.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\object.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1751,6 +1447,10 @@ SOURCE=..\..\include\wx\platinfo.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\meta\pod.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\power.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\power.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1763,6 +1463,10 @@ SOURCE=..\..\include\wx\ptr_scpd.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ptr_shrd.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\recguard.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\recguard.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1771,10 +1475,30 @@ SOURCE=..\..\include\wx\regex.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\meta\removeref.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\rtti.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\scopedarray.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\scopedptr.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\scopeguard.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\scopeguard.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\sharedptr.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\snglinst.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\snglinst.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1795,6 +1519,10 @@ SOURCE=..\..\include\wx\stdpaths.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\stdstream.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\stockitem.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\stockitem.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1847,18 +1575,38 @@ SOURCE=..\..\include\wx\thread.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\time.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\timer.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\timer.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\tls.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\tokenzr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\tokenzr.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\tracker.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\translation.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\txtstrm.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\txtstrm.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\typeinfo.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\types.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\types.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1871,6 +1619,10 @@ SOURCE=..\..\include\wx\uri.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ustring.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\utils.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\utils.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1887,10 +1639,18 @@ SOURCE=..\..\include\wx\version.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\versioninfo.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\volume.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\volume.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\weakref.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\wfstream.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\wfstream.h\r
 # End Source File\r
 # Begin Source File\r


@@ -1919,14 +1679,38 @@ SOURCE=..\..\include\wx\wxprec.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xlocale.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xti.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\xti.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xti2.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xtictor.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xtihandler.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xtiprop.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xtistrm.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\xtistrm.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xtitypes.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\zipstrm.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\zipstrm.h\r
 # End Source File\r
 # Begin Source File\r