X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7dd1f1bc88ff222986cbf2efa81c0e7f5b06cb3..91b34dd9e1b29ace037dddc60513fbe79560403f:/build/wx_baselib.dsp?ds=sidebyside

diff --git a/build/wx_baselib.dsp b/build/wx_baselib.dsp
index 4a3f1e379f..d1eb738891 100644
--- a/build/wx_baselib.dsp
+++ b/build/wx_baselib.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=baselib - Win32 Static Native Release Unicode
+CFG=baselib - Win32 LIB wxUniv Release Ansi
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,18 +13,18 @@ CFG=baselib - Win32 Static Native Release Unicode
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "wx_baselib.mak" CFG="baselib - Win32 Static Native Release Unicode"
+!MESSAGE NMAKE /f "wx_baselib.mak" CFG="baselib - Win32 LIB wxUniv Release Ansi"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "baselib - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "baselib - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "baselib - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library")
-!MESSAGE "baselib - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "baselib - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library")
-!MESSAGE "baselib - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library")
-!MESSAGE "baselib - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library")
-!MESSAGE "baselib - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "baselib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "baselib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "baselib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "baselib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "baselib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "baselib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "baselib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "baselib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -34,202 +34,293 @@ CFG=baselib - Win32 Static Native Release Unicode
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "baselib - Win32 Static Native Release Unicode"
+!IF  "$(CFG)" == "baselib - Win32 LIB wxUniv Release Ansi"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_mswu\"
-# PROP BASE Intermediate_Dir "vc_mswu\baselib"
+# PROP BASE Output_Dir "..\lib\vc_mswuniv"
+# PROP BASE Intermediate_Dir "vc_mswuniv\baselib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_mswu\"
-# PROP Intermediate_Dir "vc_mswu\baselib"
+# PROP Output_Dir "..\lib\vc_mswuniv"
+# PROP Intermediate_Dir "vc_mswuniv\baselib"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25.lib"
 
-!ELSEIF  "$(CFG)" == "baselib - Win32 Static wxUniv Release Unicode"
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB Native Release Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_mswunivu\"
-# PROP BASE Intermediate_Dir "vc_mswunivu\baselib"
+# PROP BASE Output_Dir "..\lib\vc_mswu"
+# PROP BASE Intermediate_Dir "vc_mswu\baselib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_mswunivu\"
-# PROP Intermediate_Dir "vc_mswunivu\baselib"
+# PROP Output_Dir "..\lib\vc_mswu"
+# PROP Intermediate_Dir "vc_mswu\baselib"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxbase25u.lib"
 
-!ELSEIF  "$(CFG)" == "baselib - Win32 Static Native Release Ansi"
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB wxUniv Debug Ansi"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_msw\"
-# PROP BASE Intermediate_Dir "vc_msw\baselib"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\lib\vc_mswunivd"
+# PROP BASE Intermediate_Dir "vc_mswunivd\baselib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_msw\"
-# PROP Intermediate_Dir "vc_msw\baselib"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\lib\vc_mswunivd"
+# PROP Intermediate_Dir "vc_mswunivd\baselib"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxbase25.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxbase25.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d.lib"
 
-!ELSEIF  "$(CFG)" == "baselib - Win32 Static Native Debug Unicode"
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB Native Release Ansi"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\lib\vc_mswud\"
-# PROP BASE Intermediate_Dir "vc_mswud\baselib"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\lib\vc_msw"
+# PROP BASE Intermediate_Dir "vc_msw\baselib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\lib\vc_mswud\"
-# PROP Intermediate_Dir "vc_mswud\baselib"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\lib\vc_msw"
+# PROP Intermediate_Dir "vc_msw\baselib"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxbase25.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxbase25.lib"
 
-!ELSEIF  "$(CFG)" == "baselib - Win32 Static wxUniv Debug Ansi"
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB Native Debug Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\lib\vc_mswunivd\"
-# PROP BASE Intermediate_Dir "vc_mswunivd\baselib"
+# PROP BASE Output_Dir "..\lib\vc_mswud"
+# PROP BASE Intermediate_Dir "vc_mswud\baselib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\lib\vc_mswunivd\"
-# PROP Intermediate_Dir "vc_mswunivd\baselib"
+# PROP Output_Dir "..\lib\vc_mswud"
+# PROP Intermediate_Dir "vc_mswud\baselib"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxbase25d.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxbase25ud.lib"
 
-!ELSEIF  "$(CFG)" == "baselib - Win32 Static wxUniv Release Ansi"
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB wxUniv Release Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_mswuniv\"
-# PROP BASE Intermediate_Dir "vc_mswuniv\baselib"
+# PROP BASE Output_Dir "..\lib\vc_mswunivu"
+# PROP BASE Intermediate_Dir "vc_mswunivu\baselib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_mswuniv\"
-# PROP Intermediate_Dir "vc_mswuniv\baselib"
+# PROP Output_Dir "..\lib\vc_mswunivu"
+# PROP Intermediate_Dir "vc_mswunivu\baselib"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxbase25.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxbase25u.lib"
 
-!ELSEIF  "$(CFG)" == "baselib - Win32 Static Native Debug Ansi"
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB wxUniv Debug Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\lib\vc_mswd\"
-# PROP BASE Intermediate_Dir "vc_mswd\baselib"
+# PROP BASE Output_Dir "..\lib\vc_mswunivud"
+# PROP BASE Intermediate_Dir "vc_mswunivud\baselib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\lib\vc_mswd\"
-# PROP Intermediate_Dir "vc_mswd\baselib"
+# PROP Output_Dir "..\lib\vc_mswunivud"
+# PROP Intermediate_Dir "vc_mswunivud\baselib"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud.lib"
 
-!ELSEIF  "$(CFG)" == "baselib - Win32 Static wxUniv Debug Unicode"
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB Native Debug Ansi"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\lib\vc_mswunivud\"
-# PROP BASE Intermediate_Dir "vc_mswunivud\baselib"
+# PROP BASE Output_Dir "..\lib\vc_mswd"
+# PROP BASE Intermediate_Dir "vc_mswd\baselib"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\lib\vc_mswunivud\"
-# PROP Intermediate_Dir "vc_mswunivud\baselib"
+# PROP Output_Dir "..\lib\vc_mswd"
+# PROP Intermediate_Dir "vc_mswd\baselib"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxbase25ud.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxbase25d.lib"
 
 !ENDIF
 
 # Begin Target
 
-# Name "baselib - Win32 Static Native Release Unicode"
-# Name "baselib - Win32 Static wxUniv Release Unicode"
-# Name "baselib - Win32 Static Native Release Ansi"
-# Name "baselib - Win32 Static Native Debug Unicode"
-# Name "baselib - Win32 Static wxUniv Debug Ansi"
-# Name "baselib - Win32 Static wxUniv Release Ansi"
-# Name "baselib - Win32 Static Native Debug Ansi"
-# Name "baselib - Win32 Static wxUniv Debug Unicode"
+# Name "baselib - Win32 LIB wxUniv Release Ansi"
+# Name "baselib - Win32 LIB Native Release Unicode"
+# Name "baselib - Win32 LIB wxUniv Debug Ansi"
+# Name "baselib - Win32 LIB Native Release Ansi"
+# Name "baselib - Win32 LIB Native Debug Unicode"
+# Name "baselib - Win32 LIB wxUniv Release Unicode"
+# Name "baselib - Win32 LIB wxUniv Debug Unicode"
+# Name "baselib - Win32 LIB Native Debug Ansi"
+# Begin Group "Setup Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "baselib - Win32 LIB wxUniv Release Ansi"
+
+# Begin Custom Build - Creating ..\lib\vc_mswuniv\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\lib\vc_mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\vc_mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB Native Release Unicode"
+
+# Begin Custom Build - Creating ..\lib\vc_mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\lib\vc_mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\vc_mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB wxUniv Debug Ansi"
+
+# Begin Custom Build - Creating ..\lib\vc_mswunivd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\lib\vc_mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\vc_mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB Native Release Ansi"
+
+# Begin Custom Build - Creating ..\lib\vc_msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\lib\vc_msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\vc_msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB Native Debug Unicode"
+
+# Begin Custom Build - Creating ..\lib\vc_mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\lib\vc_mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\vc_mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB wxUniv Release Unicode"
+
+# Begin Custom Build - Creating ..\lib\vc_mswunivu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\lib\vc_mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\vc_mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB wxUniv Debug Unicode"
+
+# Begin Custom Build - Creating ..\lib\vc_mswunivud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\lib\vc_mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\vc_mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 LIB Native Debug Ansi"
+
+# Begin Custom Build - Creating ..\lib\vc_mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\lib\vc_mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\lib\vc_mswd\wx\setup.h
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
 # Begin Group "Common Headers"
 
 # PROP Default_Filter ""
@@ -291,18 +382,6 @@ SOURCE=..\include\wx\datstrm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dbkeyg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dbtable.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\dde.h
 # End Source File
 # Begin Source File
@@ -495,6 +574,10 @@ SOURCE=..\include\wx\msw\winundef.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\wrapcctl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\wrapwin.h
 # End Source File
 # Begin Source File
@@ -635,14 +718,6 @@ SOURCE=..\src\common\datstrm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\common\db.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\common\dbtable.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\common\dircmn.cpp
 # End Source File
 # Begin Source File