return false from Dispatch() if gtk_main_quit() was called (patch 1864846)

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

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index dde5777b5d93f04d273e605074e85b4ec6b23ac2..bdbe140c02717cf1138405adcdac6eb1f5c26e66 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 "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 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 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 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
@@ -43,7 +35,7 @@ CFG=base - Win32 Debug
 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
 # PROP BASE Use_Debug_Libraries 0\r
@@ -65,10 +57,10 @@ BSC32=bscmake.exe
 # 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 odbc32.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 odbc32.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 /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
 \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
@@ -90,60 +82,10 @@ BSC32=bscmake.exe
 # 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 odbc32.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 odbc32.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
+# 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
-# 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
-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 odbc32.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 odbc32.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 Universal Debug"\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 odbc32.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 odbc32.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
+!ELSEIF  "$(CFG)" == "base - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -165,10 +107,10 @@ BSC32=bscmake.exe
 # 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 odbc32.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 odbc32.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 /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
 \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
@@ -190,60 +132,10 @@ BSC32=bscmake.exe
 # 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 odbc32.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 odbc32.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
-\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 odbc32.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 odbc32.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
-\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 odbc32.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 odbc32.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 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 Universal Unicode Release"\r
+!ELSEIF  "$(CFG)" == "base - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\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
-!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
@@ -289,53 +181,7 @@ 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
-!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
-\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
+!ELSEIF  "$(CFG)" == "base - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\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
-!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
@@ -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
-!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
-# 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 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 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 Unicode Release"\r
-# Name "base - Win32 Unicode Debug"\r
 # Name "base - Win32 Release"\r
 # Name "base - Win32 Debug"\r
 # Begin Group "Common Sources"\r
@@ -861,38 +653,18 @@ SOURCE=..\..\src\msw\utilsexc.cpp
 \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
-!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 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
@@ -901,14 +673,6 @@ SOURCE=..\..\src\msw\version.rc
 \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
@@ -932,19 +696,7 @@ SOURCE=..\..\src\msw\volume.cpp
 \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
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "base - Win32 DLL Universal Release"\r
 \r
 # Begin Custom Build - \r
 \r
@@ -956,7 +708,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 \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
@@ -966,7 +718,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \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
@@ -976,38 +728,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \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
@@ -1020,7 +740,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \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
@@ -1030,7 +750,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \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
@@ -1040,26 +760,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \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
@@ -1067,7 +767,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \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
@@ -1077,7 +777,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \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
@@ -1087,38 +787,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \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
@@ -1131,7 +799,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \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
@@ -1141,7 +809,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \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
@@ -1151,38 +819,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \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
@@ -1234,7 +870,7 @@ SOURCE=..\..\include\wx\msw\gccpriv.h
 \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
@@ -1244,7 +880,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \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
@@ -1254,27 +890,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \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
@@ -1284,7 +900,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \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
@@ -1294,27 +910,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \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
@@ -1324,7 +920,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \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
@@ -1334,27 +930,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \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
@@ -1364,7 +940,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \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
@@ -1374,26 +950,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \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
@@ -1515,6 +1071,10 @@ SOURCE=..\..\include\wx\clntdata.h
 # 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
@@ -1691,14 +1251,6 @@ SOURCE=..\..\include\wx\ipcbase.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\isql.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\isqlext.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