compate charset names case-insensitively in GetEncodingFromName()

[wxWidgets.git] / build / msw / makefile.vc
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc

index f50ea4cd4a2d33dd3e7b417d6d76474afa4c321f..e8e8cd91fc742b34562650a02c07b37e84689b5a 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -18,30 +18,30 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
         DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
         DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \
         USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_XRC="$(USE_XRC)" \
         DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
         DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \
         USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_XRC="$(USE_XRC)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
         VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
         WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
         CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
         RUNTIME_LIBS="$(RUNTIME_LIBS)"
         VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
         WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
         CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
         RUNTIME_LIBS="$(RUNTIME_LIBS)"
-WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
+WX_RELEASE_NODOT = 26
  OBJS = \
         vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
  OBJS = \
         vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO) \
+WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
         /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__UNICODE_DEFINE_p) $(CPPFLAGS) \
-       $(CFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\include \
+       /I$(SETUPHDIR) /D__WXMSW__ $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
         $(OBJS)\wxregex_regexec.obj \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
         $(OBJS)\wxregex_regexec.obj \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
-WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_14_p) \
+WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
@@ -56,8 +56,8 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_infback.obj \
         $(OBJS)\wxzlib_inftrees.obj \
         $(OBJS)\wxzlib_inffast.obj
         $(OBJS)\wxzlib_infback.obj \
         $(OBJS)\wxzlib_inftrees.obj \
         $(OBJS)\wxzlib_inffast.obj
-WXPNG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_27) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_26_p) \
+WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
@@ -77,8 +77,8 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwrite.obj \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
         $(OBJS)\wxpng_pngwrite.obj \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
-WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_39) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_38_p) \
+WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
@@ -127,8 +127,8 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jquant1.obj \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
         $(OBJS)\wxjpeg_jquant1.obj \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
-WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_50_p) \
+WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \
         $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \
         $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
@@ -144,6 +144,7 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_dirwrite.obj \
         $(OBJS)\wxtiff_tif_dumpmode.obj \
         $(OBJS)\wxtiff_tif_error.obj \
         $(OBJS)\wxtiff_tif_dirwrite.obj \
         $(OBJS)\wxtiff_tif_dumpmode.obj \
         $(OBJS)\wxtiff_tif_error.obj \
+       $(OBJS)\wxtiff_tif_extension.obj \
         $(OBJS)\wxtiff_tif_fax3.obj \
         $(OBJS)\wxtiff_tif_fax3sm.obj \
         $(OBJS)\wxtiff_tif_getimage.obj \
         $(OBJS)\wxtiff_tif_fax3.obj \
         $(OBJS)\wxtiff_tif_fax3sm.obj \
         $(OBJS)\wxtiff_tif_getimage.obj \
@@ -166,33 +167,37 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_warning.obj \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
         $(OBJS)\wxtiff_tif_warning.obj \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
-WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \
+WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_62_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       $(____LIBDIRNAME_FILENAMES_6_p) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(LIBDIRNAME) \
+       /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.obj \
         $(OBJS)\wxexpat_xmlrole.obj \
         $(OBJS)\wxexpat_xmltok.obj
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.obj \
         $(OBJS)\wxexpat_xmlrole.obj \
         $(OBJS)\wxexpat_xmltok.obj
-MONODLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_75_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)
-MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)
+MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_75_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 /DWXMAKINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dummy.obj \
  MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dummy.obj \
+       $(OBJS)\monodll_version.res \
         $(OBJS)\monodll_appbase.obj \
         $(OBJS)\monodll_archive.obj \
         $(OBJS)\monodll_clntdata.obj \
         $(OBJS)\monodll_appbase.obj \
         $(OBJS)\monodll_archive.obj \
         $(OBJS)\monodll_clntdata.obj \
@@ -250,12 +255,15 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_zstream.obj \
         $(OBJS)\monodll_basemsw.obj \
         $(OBJS)\monodll_crashrpt.obj \
         $(OBJS)\monodll_zstream.obj \
         $(OBJS)\monodll_basemsw.obj \
         $(OBJS)\monodll_crashrpt.obj \
+       $(OBJS)\monodll_debughlp.obj \
         $(OBJS)\monodll_dde.obj \
         $(OBJS)\monodll_dir.obj \
         $(OBJS)\monodll_dde.obj \
         $(OBJS)\monodll_dir.obj \
+       $(OBJS)\monodll_dlmsw.obj \
         $(OBJS)\monodll_mimetype.obj \
         $(OBJS)\monodll_regconf.obj \
         $(OBJS)\monodll_registry.obj \
         $(OBJS)\monodll_snglinst.obj \
         $(OBJS)\monodll_mimetype.obj \
         $(OBJS)\monodll_regconf.obj \
         $(OBJS)\monodll_registry.obj \
         $(OBJS)\monodll_snglinst.obj \
+       $(OBJS)\monodll_stackwalk.obj \
         $(OBJS)\monodll_stdpaths.obj \
         $(OBJS)\monodll_thread.obj \
         $(OBJS)\monodll_utils.obj \
         $(OBJS)\monodll_stdpaths.obj \
         $(OBJS)\monodll_thread.obj \
         $(OBJS)\monodll_utils.obj \
@@ -282,23 +290,25 @@ MONODLL_OBJECTS =  \
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj \
         $(OBJS)\monodll_xtixml.obj
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj \
         $(OBJS)\monodll_xtixml.obj
-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_87_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_87_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
  MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dummy.obj \
         $(OBJS)\monolib_appbase.obj \
  MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dummy.obj \
         $(OBJS)\monolib_appbase.obj \
@@ -358,12 +368,15 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_zstream.obj \
         $(OBJS)\monolib_basemsw.obj \
         $(OBJS)\monolib_crashrpt.obj \
         $(OBJS)\monolib_zstream.obj \
         $(OBJS)\monolib_basemsw.obj \
         $(OBJS)\monolib_crashrpt.obj \
+       $(OBJS)\monolib_debughlp.obj \
         $(OBJS)\monolib_dde.obj \
         $(OBJS)\monolib_dir.obj \
         $(OBJS)\monolib_dde.obj \
         $(OBJS)\monolib_dir.obj \
+       $(OBJS)\monolib_dlmsw.obj \
         $(OBJS)\monolib_mimetype.obj \
         $(OBJS)\monolib_regconf.obj \
         $(OBJS)\monolib_registry.obj \
         $(OBJS)\monolib_snglinst.obj \
         $(OBJS)\monolib_mimetype.obj \
         $(OBJS)\monolib_regconf.obj \
         $(OBJS)\monolib_registry.obj \
         $(OBJS)\monolib_snglinst.obj \
+       $(OBJS)\monolib_stackwalk.obj \
         $(OBJS)\monolib_stdpaths.obj \
         $(OBJS)\monolib_thread.obj \
         $(OBJS)\monolib_utils.obj \
         $(OBJS)\monolib_stdpaths.obj \
         $(OBJS)\monolib_thread.obj \
         $(OBJS)\monolib_utils.obj \
@@ -390,26 +403,30 @@ MONOLIB_OBJECTS =  \
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj \
         $(OBJS)\monolib_xtixml.obj
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj \
         $(OBJS)\monolib_xtixml.obj
-BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \
+BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_100_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \
+       $(CPPFLAGS) $(CFLAGS)
+BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_100_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
+       $(OBJS)\basedll_version.res \
         $(OBJS)\basedll_appbase.obj \
         $(OBJS)\basedll_archive.obj \
         $(OBJS)\basedll_clntdata.obj \
         $(OBJS)\basedll_appbase.obj \
         $(OBJS)\basedll_archive.obj \
         $(OBJS)\basedll_clntdata.obj \
@@ -467,12 +484,15 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_zstream.obj \
         $(OBJS)\basedll_basemsw.obj \
         $(OBJS)\basedll_crashrpt.obj \
         $(OBJS)\basedll_zstream.obj \
         $(OBJS)\basedll_basemsw.obj \
         $(OBJS)\basedll_crashrpt.obj \
+       $(OBJS)\basedll_debughlp.obj \
         $(OBJS)\basedll_dde.obj \
         $(OBJS)\basedll_dir.obj \
         $(OBJS)\basedll_dde.obj \
         $(OBJS)\basedll_dir.obj \
+       $(OBJS)\basedll_dlmsw.obj \
         $(OBJS)\basedll_mimetype.obj \
         $(OBJS)\basedll_regconf.obj \
         $(OBJS)\basedll_registry.obj \
         $(OBJS)\basedll_snglinst.obj \
         $(OBJS)\basedll_mimetype.obj \
         $(OBJS)\basedll_regconf.obj \
         $(OBJS)\basedll_registry.obj \
         $(OBJS)\basedll_snglinst.obj \
+       $(OBJS)\basedll_stackwalk.obj \
         $(OBJS)\basedll_stdpaths.obj \
         $(OBJS)\basedll_thread.obj \
         $(OBJS)\basedll_utils.obj \
         $(OBJS)\basedll_stdpaths.obj \
         $(OBJS)\basedll_thread.obj \
         $(OBJS)\basedll_utils.obj \
@@ -484,23 +504,26 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_main.obj \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
         $(OBJS)\basedll_main.obj \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_112_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_112_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
         $(OBJS)\baselib_appbase.obj \
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
         $(OBJS)\baselib_appbase.obj \
@@ -560,12 +583,15 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_zstream.obj \
         $(OBJS)\baselib_basemsw.obj \
         $(OBJS)\baselib_crashrpt.obj \
         $(OBJS)\baselib_zstream.obj \
         $(OBJS)\baselib_basemsw.obj \
         $(OBJS)\baselib_crashrpt.obj \
+       $(OBJS)\baselib_debughlp.obj \
         $(OBJS)\baselib_dde.obj \
         $(OBJS)\baselib_dir.obj \
         $(OBJS)\baselib_dde.obj \
         $(OBJS)\baselib_dir.obj \
+       $(OBJS)\baselib_dlmsw.obj \
         $(OBJS)\baselib_mimetype.obj \
         $(OBJS)\baselib_regconf.obj \
         $(OBJS)\baselib_registry.obj \
         $(OBJS)\baselib_snglinst.obj \
         $(OBJS)\baselib_mimetype.obj \
         $(OBJS)\baselib_regconf.obj \
         $(OBJS)\baselib_registry.obj \
         $(OBJS)\baselib_snglinst.obj \
+       $(OBJS)\baselib_stackwalk.obj \
         $(OBJS)\baselib_stdpaths.obj \
         $(OBJS)\baselib_thread.obj \
         $(OBJS)\baselib_utils.obj \
         $(OBJS)\baselib_stdpaths.obj \
         $(OBJS)\baselib_thread.obj \
         $(OBJS)\baselib_utils.obj \
@@ -577,18 +603,20 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
-NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \
+NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_141)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_125_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
+       $(OBJS)\netdll_version.res \
         $(OBJS)\netdll_fs_inet.obj \
         $(OBJS)\netdll_ftp.obj \
         $(OBJS)\netdll_http.obj \
         $(OBJS)\netdll_fs_inet.obj \
         $(OBJS)\netdll_ftp.obj \
         $(OBJS)\netdll_http.obj \
@@ -601,15 +629,16 @@ NETDLL_OBJECTS =  \
         $(OBJS)\netdll_url.obj \
         $(OBJS)\netdll_gsocket.obj \
         $(OBJS)\netdll_urlmsw.obj
         $(OBJS)\netdll_url.obj \
         $(OBJS)\netdll_gsocket.obj \
         $(OBJS)\netdll_urlmsw.obj
-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
-       $(____DEBUGRUNTIME_137_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  NETLIB_OBJECTS =  \
         $(OBJS)\netlib_dummy.obj \
         $(OBJS)\netlib_fs_inet.obj \
  NETLIB_OBJECTS =  \
         $(OBJS)\netlib_dummy.obj \
         $(OBJS)\netlib_fs_inet.obj \
@@ -624,18 +653,20 @@ NETLIB_OBJECTS =  \
         $(OBJS)\netlib_url.obj \
         $(OBJS)\netlib_gsocket.obj \
         $(OBJS)\netlib_urlmsw.obj
         $(OBJS)\netlib_url.obj \
         $(OBJS)\netlib_gsocket.obj \
         $(OBJS)\netlib_urlmsw.obj
-COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \
+COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_168)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_150_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
  COREDLL_OBJECTS =  \
         $(OBJS)\coredll_dummy.obj \
  COREDLL_OBJECTS =  \
         $(OBJS)\coredll_dummy.obj \
+       $(OBJS)\coredll_version.res \
         $(OBJS)\coredll_event.obj \
         $(OBJS)\coredll_fs_mem.obj \
         $(OBJS)\coredll_msgout.obj \
         $(OBJS)\coredll_event.obj \
         $(OBJS)\coredll_fs_mem.obj \
         $(OBJS)\coredll_msgout.obj \
@@ -644,15 +675,16 @@ COREDLL_OBJECTS =  \
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \
+CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
-       $(____DEBUGRUNTIME_162_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)
  CORELIB_OBJECTS =  \
         $(OBJS)\corelib_dummy.obj \
         $(OBJS)\corelib_event.obj \
  CORELIB_OBJECTS =  \
         $(OBJS)\corelib_dummy.obj \
         $(OBJS)\corelib_event.obj \
@@ -663,144 +695,138 @@ CORELIB_OBJECTS =  \
         $(OBJS)\corelib_mslu.obj \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
         $(OBJS)\corelib_mslu.obj \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
-ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_176) /DWIN32 \
+ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_195)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_175_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  ADVDLL_OBJECTS =  \
         $(OBJS)\advdll_dummy.obj \
  ADVDLL_OBJECTS =  \
         $(OBJS)\advdll_dummy.obj \
-       $(OBJS)\advdll_calctrl.obj \
-       $(OBJS)\advdll_grid.obj \
-       $(OBJS)\advdll_gridctrl.obj \
-       $(OBJS)\advdll_gridsel.obj \
-       $(OBJS)\advdll_helpext.obj \
-       $(OBJS)\advdll_laywin.obj \
-       $(OBJS)\advdll_sashwin.obj \
-       $(OBJS)\advdll_splash.obj \
-       $(OBJS)\advdll_tipdlg.obj \
-       $(OBJS)\advdll_wizard.obj \
-       $(OBJS)\advdll_taskbarcmn.obj \
-       $(OBJS)\advdll_sound.obj \
-       $(OBJS)\advdll_taskbar.obj \
-       $(OBJS)\advdll_joystick.obj
-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_188) /DWIN32 \
+       $(OBJS)\advdll_version.res \
+       $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
-       $(____DEBUGRUNTIME_187_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  ADVLIB_OBJECTS =  \
         $(OBJS)\advlib_dummy.obj \
         /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  ADVLIB_OBJECTS =  \
         $(OBJS)\advlib_dummy.obj \
-       $(OBJS)\advlib_calctrl.obj \
-       $(OBJS)\advlib_grid.obj \
-       $(OBJS)\advlib_gridctrl.obj \
-       $(OBJS)\advlib_gridsel.obj \
-       $(OBJS)\advlib_helpext.obj \
-       $(OBJS)\advlib_laywin.obj \
-       $(OBJS)\advlib_sashwin.obj \
-       $(OBJS)\advlib_splash.obj \
-       $(OBJS)\advlib_tipdlg.obj \
-       $(OBJS)\advlib_wizard.obj \
-       $(OBJS)\advlib_taskbarcmn.obj \
-       $(OBJS)\advlib_sound.obj \
-       $(OBJS)\advlib_taskbar.obj \
-       $(OBJS)\advlib_joystick.obj
-MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_201) /DWIN32 \
+       $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
+MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_222)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_200_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_MEDIA $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mediadll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  MEDIADLL_OBJECTS =  \
         $(OBJS)\mediadll_dummy.obj \
  MEDIADLL_OBJECTS =  \
         $(OBJS)\mediadll_dummy.obj \
+       $(OBJS)\mediadll_version.res \
         $(OBJS)\mediadll_mediactrlcmn.obj \
         $(OBJS)\mediadll_mediactrlcmn.obj \
-       $(OBJS)\mediadll_mediactrl.obj
-MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_213) /DWIN32 \
+       $(OBJS)\mediadll_mediactrl.obj \
+       $(OBJS)\mediadll_activex.obj
+MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
-       $(____DEBUGRUNTIME_212_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)
  MEDIALIB_OBJECTS =  \
         $(OBJS)\medialib_dummy.obj \
         $(OBJS)\medialib_mediactrlcmn.obj \
         /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)
  MEDIALIB_OBJECTS =  \
         $(OBJS)\medialib_dummy.obj \
         $(OBJS)\medialib_mediactrlcmn.obj \
-       $(OBJS)\medialib_mediactrl.obj
-ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_226) /DWIN32 \
+       $(OBJS)\medialib_mediactrl.obj \
+       $(OBJS)\medialib_activex.obj
+ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_249)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_225_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_ODBC \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_odbcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  ODBCDLL_OBJECTS =  \
         $(OBJS)\odbcdll_dummy.obj \
  ODBCDLL_OBJECTS =  \
         $(OBJS)\odbcdll_dummy.obj \
+       $(OBJS)\odbcdll_version.res \
         $(OBJS)\odbcdll_db.obj \
         $(OBJS)\odbcdll_dbtable.obj
         $(OBJS)\odbcdll_db.obj \
         $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_238) /DWIN32 \
+ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \
-       $(____DEBUGRUNTIME_237_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_odbclib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbclib.pch" $(CPPFLAGS) $(CXXFLAGS)
  ODBCLIB_OBJECTS =  \
         $(OBJS)\odbclib_dummy.obj \
         $(OBJS)\odbclib_db.obj \
         $(OBJS)\odbclib_dbtable.obj
  ODBCLIB_OBJECTS =  \
         $(OBJS)\odbclib_dummy.obj \
         $(OBJS)\odbclib_db.obj \
         $(OBJS)\odbclib_dbtable.obj
-DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_251) /DWIN32 \
+DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_276)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_250_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgriddll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  DBGRIDDLL_OBJECTS =  \
         $(OBJS)\dbgriddll_dummy.obj \
  DBGRIDDLL_OBJECTS =  \
         $(OBJS)\dbgriddll_dummy.obj \
+       $(OBJS)\dbgriddll_version.res \
         $(OBJS)\dbgriddll_dbgrid.obj
         $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_263) /DWIN32 \
+DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.pdb \
-       $(____DEBUGRUNTIME_262_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_dbgridlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  DBGRIDLIB_OBJECTS =  \
         $(OBJS)\dbgridlib_dummy.obj \
         $(OBJS)\dbgridlib_dbgrid.obj
         /Fp"$(OBJS)\wxprec_dbgridlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  DBGRIDLIB_OBJECTS =  \
         $(OBJS)\dbgridlib_dummy.obj \
         $(OBJS)\dbgridlib_dbgrid.obj
-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_276) /DWIN32 \
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_303)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_275_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_dummy.obj \
  HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_dummy.obj \
+       $(OBJS)\htmldll_version.res \
         $(OBJS)\htmldll_helpbest.obj \
         $(OBJS)\htmldll_helpctrl.obj \
         $(OBJS)\htmldll_helpdata.obj \
         $(OBJS)\htmldll_helpbest.obj \
         $(OBJS)\htmldll_helpctrl.obj \
         $(OBJS)\htmldll_helpdata.obj \
@@ -823,14 +849,15 @@ HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_m_tables.obj \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
         $(OBJS)\htmldll_m_tables.obj \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_288) /DWIN32 \
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
-       $(____DEBUGRUNTIME_287_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_dummy.obj \
         /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_dummy.obj \
@@ -856,44 +883,80 @@ HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
-XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_301) /DWIN32 \
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_330)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_300_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_QA $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qadll.pch" \
         $(CPPFLAGS) $(CXXFLAGS)
         $(CPPFLAGS) $(CXXFLAGS)
+QADLL_OBJECTS =  \
+       $(OBJS)\qadll_dummy.obj \
+       $(OBJS)\qadll_version.res \
+       $(OBJS)\qadll_debugrpt.obj \
+       $(OBJS)\qadll_dbgrptg.obj
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_qalib.pch" $(CPPFLAGS) $(CXXFLAGS)
+QALIB_OBJECTS =  \
+       $(OBJS)\qalib_dummy.obj \
+       $(OBJS)\qalib_debugrpt.obj \
+       $(OBJS)\qalib_dbgrptg.obj
+XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_357)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
+       $(OBJS)\xmldll_version.res \
         $(OBJS)\xmldll_xml.obj \
         $(OBJS)\xmldll_xtixml.obj
         $(OBJS)\xmldll_xml.obj \
         $(OBJS)\xmldll_xtixml.obj
-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_313) /DWIN32 \
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
-       $(____DEBUGRUNTIME_312_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  XMLLIB_OBJECTS =  \
         $(OBJS)\xmllib_dummy.obj \
         $(OBJS)\xmllib_xml.obj \
         $(OBJS)\xmllib_xtixml.obj
  XMLLIB_OBJECTS =  \
         $(OBJS)\xmllib_dummy.obj \
         $(OBJS)\xmllib_xml.obj \
         $(OBJS)\xmllib_xtixml.obj
-XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_326) /DWIN32 \
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_384)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_325_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_XRC $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XRC $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_dummy.obj \
  XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_dummy.obj \
+       $(OBJS)\xrcdll_version.res \
         $(OBJS)\xrcdll_xh_bmpbt.obj \
         $(OBJS)\xrcdll_xh_bmp.obj \
         $(OBJS)\xrcdll_xh_bttn.obj \
         $(OBJS)\xrcdll_xh_bmpbt.obj \
         $(OBJS)\xrcdll_xh_bmp.obj \
         $(OBJS)\xrcdll_xh_bttn.obj \
@@ -901,13 +964,17 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_chckb.obj \
         $(OBJS)\xrcdll_xh_chckl.obj \
         $(OBJS)\xrcdll_xh_choic.obj \
         $(OBJS)\xrcdll_xh_chckb.obj \
         $(OBJS)\xrcdll_xh_chckl.obj \
         $(OBJS)\xrcdll_xh_choic.obj \
+       $(OBJS)\xrcdll_xh_choicbk.obj \
         $(OBJS)\xrcdll_xh_combo.obj \
         $(OBJS)\xrcdll_xh_combo.obj \
+       $(OBJS)\xrcdll_xh_datectrl.obj \
         $(OBJS)\xrcdll_xh_dlg.obj \
         $(OBJS)\xrcdll_xh_frame.obj \
         $(OBJS)\xrcdll_xh_dlg.obj \
         $(OBJS)\xrcdll_xh_frame.obj \
+       $(OBJS)\xrcdll_xh_mdi.obj \
         $(OBJS)\xrcdll_xh_gauge.obj \
         $(OBJS)\xrcdll_xh_gdctl.obj \
         $(OBJS)\xrcdll_xh_html.obj \
         $(OBJS)\xrcdll_xh_listb.obj \
         $(OBJS)\xrcdll_xh_gauge.obj \
         $(OBJS)\xrcdll_xh_gdctl.obj \
         $(OBJS)\xrcdll_xh_html.obj \
         $(OBJS)\xrcdll_xh_listb.obj \
+       $(OBJS)\xrcdll_xh_listbk.obj \
         $(OBJS)\xrcdll_xh_listc.obj \
         $(OBJS)\xrcdll_xh_menu.obj \
         $(OBJS)\xrcdll_xh_notbk.obj \
         $(OBJS)\xrcdll_xh_listc.obj \
         $(OBJS)\xrcdll_xh_menu.obj \
         $(OBJS)\xrcdll_xh_notbk.obj \
@@ -933,14 +1000,15 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_wizrd.obj \
         $(OBJS)\xrcdll_xmlres.obj \
         $(OBJS)\xrcdll_xmlrsall.obj
         $(OBJS)\xrcdll_xh_wizrd.obj \
         $(OBJS)\xrcdll_xmlres.obj \
         $(OBJS)\xrcdll_xmlrsall.obj
-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_338) /DWIN32 \
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
-       $(____DEBUGRUNTIME_337_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
  XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_dummy.obj \
         /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
  XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_dummy.obj \
@@ -951,13 +1019,17 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_chckb.obj \
         $(OBJS)\xrclib_xh_chckl.obj \
         $(OBJS)\xrclib_xh_choic.obj \
         $(OBJS)\xrclib_xh_chckb.obj \
         $(OBJS)\xrclib_xh_chckl.obj \
         $(OBJS)\xrclib_xh_choic.obj \
+       $(OBJS)\xrclib_xh_choicbk.obj \
         $(OBJS)\xrclib_xh_combo.obj \
         $(OBJS)\xrclib_xh_combo.obj \
+       $(OBJS)\xrclib_xh_datectrl.obj \
         $(OBJS)\xrclib_xh_dlg.obj \
         $(OBJS)\xrclib_xh_frame.obj \
         $(OBJS)\xrclib_xh_dlg.obj \
         $(OBJS)\xrclib_xh_frame.obj \
+       $(OBJS)\xrclib_xh_mdi.obj \
         $(OBJS)\xrclib_xh_gauge.obj \
         $(OBJS)\xrclib_xh_gdctl.obj \
         $(OBJS)\xrclib_xh_html.obj \
         $(OBJS)\xrclib_xh_listb.obj \
         $(OBJS)\xrclib_xh_gauge.obj \
         $(OBJS)\xrclib_xh_gdctl.obj \
         $(OBJS)\xrclib_xh_html.obj \
         $(OBJS)\xrclib_xh_listb.obj \
+       $(OBJS)\xrclib_xh_listbk.obj \
         $(OBJS)\xrclib_xh_listc.obj \
         $(OBJS)\xrclib_xh_menu.obj \
         $(OBJS)\xrclib_xh_notbk.obj \
         $(OBJS)\xrclib_xh_listc.obj \
         $(OBJS)\xrclib_xh_menu.obj \
         $(OBJS)\xrclib_xh_notbk.obj \
@@ -983,26 +1055,30 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_wizrd.obj \
         $(OBJS)\xrclib_xmlres.obj \
         $(OBJS)\xrclib_xmlrsall.obj
         $(OBJS)\xrclib_xh_wizrd.obj \
         $(OBJS)\xrclib_xmlres.obj \
         $(OBJS)\xrclib_xmlrsall.obj
-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_351) /DWIN32 \
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_411)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_350_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  GLDLL_OBJECTS =  \
         $(OBJS)\gldll_dummy.obj \
  GLDLL_OBJECTS =  \
         $(OBJS)\gldll_dummy.obj \
+       $(OBJS)\gldll_version.res \
         $(OBJS)\gldll_glcanvas.obj
         $(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_363) /DWIN32 \
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
-       $(____DEBUGRUNTIME_362_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff \
+       /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \
+       /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  GLLIB_OBJECTS =  \
         $(OBJS)\gllib_dummy.obj \
         /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  GLLIB_OBJECTS =  \
         $(OBJS)\gllib_dummy.obj \
@@ -1038,128 +1114,56 @@ WXUNIVNAME = univ
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = $(__DEBUGINFO_3_0)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_14_p = 
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_14_p = /D_DEBUG
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_14_p = $(____DEBUGINFO)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_15 = 
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_15 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_21 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_15 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_21 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
  !endif
  !endif
  !if "$(USE_GUI)" == "1"
  __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_26_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_26_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_26_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_27 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_27 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_34 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_27 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_34 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
  !endif
  !endif
  !if "$(USE_GUI)" == "1"
  __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_38_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_38_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_38_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_39 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_39 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_47 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_39 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_47 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
  !endif
  !endif
  !if "$(USE_GUI)" == "1"
  __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_50_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_50_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_50_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_51 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_51 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_51 = $(__DEBUGINFO_3_0)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_62_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_62_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_62_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_63 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_63 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_60 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_63 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_60 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(SHARED)" == "0"
-____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_lib$(CFG)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_73 = D
  !endif
  !endif
-!if "$(SHARED)" == "1"
-____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_dll$(CFG)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_73 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
@@ -1169,45 +1173,21 @@ EXTRALIBS_FOR_BASE =
  !endif
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
  __monodll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
  __monodll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_75_p = 
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_75_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_75_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_76 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_76 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_87 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_76 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_87 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_OBJECTS) \
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_OBJECTS) \
-       $(OBJS)\monodll_calctrl.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_tipdlg.obj \
-       $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_taskbarcmn.obj \
-       $(OBJS)\monodll_sound.obj \
-       $(OBJS)\monodll_taskbar.obj \
-       $(OBJS)\monodll_joystick.obj \
+       $(____ADVANCED_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_mediactrlcmn.obj \
         $(OBJS)\monodll_mediactrl.obj \
         $(OBJS)\monodll_mediactrlcmn.obj \
         $(OBJS)\monodll_mediactrl.obj \
+       $(OBJS)\monodll_activex.obj \
         $(OBJS)\monodll_helpbest.obj \
         $(OBJS)\monodll_helpctrl.obj \
         $(OBJS)\monodll_helpdata.obj \
         $(OBJS)\monodll_helpbest.obj \
         $(OBJS)\monodll_helpctrl.obj \
         $(OBJS)\monodll_helpdata.obj \
@@ -1232,6 +1212,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_htmllbox.obj \
         $(OBJS)\monodll_db.obj \
         $(OBJS)\monodll_dbtable.obj \
         $(OBJS)\monodll_htmllbox.obj \
         $(OBJS)\monodll_db.obj \
         $(OBJS)\monodll_dbtable.obj \
+       $(OBJS)\monodll_debugrpt.obj \
+       $(OBJS)\monodll_dbgrptg.obj \
         $(OBJS)\monodll_dbgrid.obj \
         $(OBJS)\monodll_xh_bmpbt.obj \
         $(OBJS)\monodll_xh_bmp.obj \
         $(OBJS)\monodll_dbgrid.obj \
         $(OBJS)\monodll_xh_bmpbt.obj \
         $(OBJS)\monodll_xh_bmp.obj \
@@ -1240,13 +1222,17 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_chckb.obj \
         $(OBJS)\monodll_xh_chckl.obj \
         $(OBJS)\monodll_xh_choic.obj \
         $(OBJS)\monodll_xh_chckb.obj \
         $(OBJS)\monodll_xh_chckl.obj \
         $(OBJS)\monodll_xh_choic.obj \
+       $(OBJS)\monodll_xh_choicbk.obj \
         $(OBJS)\monodll_xh_combo.obj \
         $(OBJS)\monodll_xh_combo.obj \
+       $(OBJS)\monodll_xh_datectrl.obj \
         $(OBJS)\monodll_xh_dlg.obj \
         $(OBJS)\monodll_xh_frame.obj \
         $(OBJS)\monodll_xh_dlg.obj \
         $(OBJS)\monodll_xh_frame.obj \
+       $(OBJS)\monodll_xh_mdi.obj \
         $(OBJS)\monodll_xh_gauge.obj \
         $(OBJS)\monodll_xh_gdctl.obj \
         $(OBJS)\monodll_xh_html.obj \
         $(OBJS)\monodll_xh_listb.obj \
         $(OBJS)\monodll_xh_gauge.obj \
         $(OBJS)\monodll_xh_gdctl.obj \
         $(OBJS)\monodll_xh_html.obj \
         $(OBJS)\monodll_xh_listb.obj \
+       $(OBJS)\monodll_xh_listbk.obj \
         $(OBJS)\monodll_xh_listc.obj \
         $(OBJS)\monodll_xh_menu.obj \
         $(OBJS)\monodll_xh_notbk.obj \
         $(OBJS)\monodll_xh_listc.obj \
         $(OBJS)\monodll_xh_menu.obj \
         $(OBJS)\monodll_xh_notbk.obj \
@@ -1664,47 +1650,62 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datectlg.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_propdlg.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_wizard.obj \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_sound.obj \
+       $(OBJS)\monodll_taskbar.obj \
+       $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datectlg.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_propdlg.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_wizard.obj \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_sound.obj \
+       $(OBJS)\monodll_taskbar.obj \
+       $(OBJS)\monodll_joystick.obj
+!endif
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
  __monolib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
  __monolib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_87_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_87_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_87_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_88 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_88 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_100 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_88 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_100 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_1_OBJECTS) \
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_1_OBJECTS) \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_grid.obj \
-       $(OBJS)\monolib_gridctrl.obj \
-       $(OBJS)\monolib_gridsel.obj \
-       $(OBJS)\monolib_helpext.obj \
-       $(OBJS)\monolib_laywin.obj \
-       $(OBJS)\monolib_sashwin.obj \
-       $(OBJS)\monolib_splash.obj \
-       $(OBJS)\monolib_tipdlg.obj \
-       $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_taskbarcmn.obj \
-       $(OBJS)\monolib_sound.obj \
-       $(OBJS)\monolib_taskbar.obj \
-       $(OBJS)\monolib_joystick.obj \
+       $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_mediactrlcmn.obj \
         $(OBJS)\monolib_mediactrl.obj \
         $(OBJS)\monolib_mediactrlcmn.obj \
         $(OBJS)\monolib_mediactrl.obj \
+       $(OBJS)\monolib_activex.obj \
         $(OBJS)\monolib_helpbest.obj \
         $(OBJS)\monolib_helpctrl.obj \
         $(OBJS)\monolib_helpdata.obj \
         $(OBJS)\monolib_helpbest.obj \
         $(OBJS)\monolib_helpctrl.obj \
         $(OBJS)\monolib_helpdata.obj \
@@ -1729,6 +1730,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_htmllbox.obj \
         $(OBJS)\monolib_db.obj \
         $(OBJS)\monolib_dbtable.obj \
         $(OBJS)\monolib_htmllbox.obj \
         $(OBJS)\monolib_db.obj \
         $(OBJS)\monolib_dbtable.obj \
+       $(OBJS)\monolib_debugrpt.obj \
+       $(OBJS)\monolib_dbgrptg.obj \
         $(OBJS)\monolib_dbgrid.obj \
         $(OBJS)\monolib_xh_bmpbt.obj \
         $(OBJS)\monolib_xh_bmp.obj \
         $(OBJS)\monolib_dbgrid.obj \
         $(OBJS)\monolib_xh_bmpbt.obj \
         $(OBJS)\monolib_xh_bmp.obj \
@@ -1737,13 +1740,17 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_chckb.obj \
         $(OBJS)\monolib_xh_chckl.obj \
         $(OBJS)\monolib_xh_choic.obj \
         $(OBJS)\monolib_xh_chckb.obj \
         $(OBJS)\monolib_xh_chckl.obj \
         $(OBJS)\monolib_xh_choic.obj \
+       $(OBJS)\monolib_xh_choicbk.obj \
         $(OBJS)\monolib_xh_combo.obj \
         $(OBJS)\monolib_xh_combo.obj \
+       $(OBJS)\monolib_xh_datectrl.obj \
         $(OBJS)\monolib_xh_dlg.obj \
         $(OBJS)\monolib_xh_frame.obj \
         $(OBJS)\monolib_xh_dlg.obj \
         $(OBJS)\monolib_xh_frame.obj \
+       $(OBJS)\monolib_xh_mdi.obj \
         $(OBJS)\monolib_xh_gauge.obj \
         $(OBJS)\monolib_xh_gdctl.obj \
         $(OBJS)\monolib_xh_html.obj \
         $(OBJS)\monolib_xh_listb.obj \
         $(OBJS)\monolib_xh_gauge.obj \
         $(OBJS)\monolib_xh_gdctl.obj \
         $(OBJS)\monolib_xh_html.obj \
         $(OBJS)\monolib_xh_listb.obj \
+       $(OBJS)\monolib_xh_listbk.obj \
         $(OBJS)\monolib_xh_listc.obj \
         $(OBJS)\monolib_xh_menu.obj \
         $(OBJS)\monolib_xh_notbk.obj \
         $(OBJS)\monolib_xh_listc.obj \
         $(OBJS)\monolib_xh_menu.obj \
         $(OBJS)\monolib_xh_notbk.obj \
@@ -2161,115 +2168,94 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-__basedll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_100_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_100_p = /D_DEBUG
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datectlg.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_propdlg.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_wizard.obj \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_sound.obj \
+       $(OBJS)\monolib_taskbar.obj \
+       $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_datectrl.obj
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_100_p = $(____DEBUGINFO)
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datectlg.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_propdlg.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_wizard.obj \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_sound.obj \
+       $(OBJS)\monolib_taskbar.obj \
+       $(OBJS)\monolib_joystick.obj
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_101 = 
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+__basedll___depname = \
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_101 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_114 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_101 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_114 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __baselib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __baselib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_112_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_112_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_112_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_113 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_113 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_127 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_113 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_127 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __netdll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __netdll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_125_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_125_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_125_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_126 = 
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_126 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_141 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_126 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_141 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __netlib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __netlib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_137_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_137_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_137_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_138 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_138 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_154 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_138 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_154 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __coredll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __coredll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_150_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_150_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_150_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_151 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_151 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_168 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_151 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_168 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_2_OBJECTS =  \
@@ -2666,23 +2652,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
  __corelib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
  __corelib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_162_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_162_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_162_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_163 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_163 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_181 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_163 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_181 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_3_OBJECTS =  \
@@ -3077,333 +3051,251 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __advdll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __advdll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_175_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_175_p = /D_DEBUG
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_175_p = $(____DEBUGINFO)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_195 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_176 = 
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_195 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_176 = d
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datectlg.obj \
+       $(OBJS)\advdll_grid.obj \
+       $(OBJS)\advdll_gridctrl.obj \
+       $(OBJS)\advdll_gridsel.obj \
+       $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_propdlg.obj \
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
+       $(OBJS)\advdll_tipdlg.obj \
+       $(OBJS)\advdll_wizard.obj \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_sound.obj \
+       $(OBJS)\advdll_taskbar.obj \
+       $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_datectrl.obj
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_176 = $(__DEBUGINFO_3_0)
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datectlg.obj \
+       $(OBJS)\advdll_grid.obj \
+       $(OBJS)\advdll_gridctrl.obj \
+       $(OBJS)\advdll_gridsel.obj \
+       $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_propdlg.obj \
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
+       $(OBJS)\advdll_tipdlg.obj \
+       $(OBJS)\advdll_wizard.obj \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_sound.obj \
+       $(OBJS)\advdll_taskbar.obj \
+       $(OBJS)\advdll_joystick.obj
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  __advlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  __advlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_187_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_187_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_187_p = $(____DEBUGINFO)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_208 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_188 = 
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_208 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_188 = d
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datectlg.obj \
+       $(OBJS)\advlib_grid.obj \
+       $(OBJS)\advlib_gridctrl.obj \
+       $(OBJS)\advlib_gridsel.obj \
+       $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_propdlg.obj \
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
+       $(OBJS)\advlib_tipdlg.obj \
+       $(OBJS)\advlib_wizard.obj \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_sound.obj \
+       $(OBJS)\advlib_taskbar.obj \
+       $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_datectrl.obj
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_188 = $(__DEBUGINFO_3_0)
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datectlg.obj \
+       $(OBJS)\advlib_grid.obj \
+       $(OBJS)\advlib_gridctrl.obj \
+       $(OBJS)\advlib_gridsel.obj \
+       $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_propdlg.obj \
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
+       $(OBJS)\advlib_tipdlg.obj \
+       $(OBJS)\advlib_wizard.obj \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_sound.obj \
+       $(OBJS)\advlib_taskbar.obj \
+       $(OBJS)\advlib_joystick.obj
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __mediadll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __mediadll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_200_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_200_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_200_p = $(____DEBUGINFO)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_201 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_201 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_222 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_201 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_222 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  __medialib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  __medialib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_212_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_212_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_212_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_213 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_213 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_235 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_213 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_235 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
  __odbcdll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
  __odbcdll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_225_p = 
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_225_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_225_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_226 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_226 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_249 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_226 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_249 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
  __odbclib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
  __odbclib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_237_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_237_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_237_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_238 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_238 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_262 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_238 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_262 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  __dbgriddll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  __dbgriddll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_250_p = 
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_250_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_250_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_251 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_251 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_276 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_251 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_276 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  __dbgridlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  __dbgridlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_262_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_262_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_262_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_263 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_263 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_289 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_263 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_289 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmldll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_275_p = 
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_275_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_275_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_276 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_276 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_303 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_276 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_303 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_287_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_287_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_287_p = $(____DEBUGINFO)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_316 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_288 = 
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_316 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_288 = d
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
+__qadll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_288 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_330 = D
  !endif
  !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-__xmldll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_330 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_300_p = 
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
+__qalib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_300_p = /D_DEBUG
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_343 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_300_p = $(____DEBUGINFO)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_343 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_301 = 
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+__xmldll___depname = \
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_301 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_357 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_301 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_357 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __xmllib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __xmllib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_312_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_312_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_312_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_313 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_313 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_370 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_313 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_370 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
  __xrcdll___depname = \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
  __xrcdll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_325_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_325_p = /D_DEBUG
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_325_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_326 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_326 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_384 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_326 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_384 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
  __xrclib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  !endif
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
  __xrclib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_337_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_337_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_337_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_338 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_338 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_397 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_338 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_397 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  __gldll___depname = \
  !endif
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  __gldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_350_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_350_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_350_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_351 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_351 = d
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_411 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_351 = $(__DEBUGINFO_3_0)
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_411 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_CORE_p = \
  !endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_CORE_p = \
@@ -3421,35 +3313,65 @@ __WXLIB_MONO_p = \
  __gllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  !endif
  __gllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_362_p = 
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_424 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_362_p = /D_DEBUG
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_424 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_4 = /DEBUG
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_362_p = $(____DEBUGINFO)
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_4 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_4 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_4 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_4 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_4 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_363 = 
+____DEBUGRUNTIME_4 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_363 = d
+____DEBUGRUNTIME_4 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_55 = /d __NO_VC_CRTDBG__
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_363 = $(__DEBUGINFO_3_0)
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_55 = /d __NO_VC_CRTDBG__
  !endif
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_28 = /DEBUG
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_49 = /d __WXUNIVERSAL__
  !endif
  !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_28 = 
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_49 = /d __WXDEBUG__
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_28 = 
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_49 = /d __WXDEBUG__
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_28 = /DEBUG
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_49 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_49 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_49 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_50 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_49 = /d wxUSE_UNICODE_MSLU=1
  !endif
  !if "$(USE_GUI)" == "1"
  __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
  !endif
  !if "$(USE_GUI)" == "1"
  __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -3475,29 +3397,29 @@ __DEBUGINFO =
  !if "$(DEBUG_INFO)" == "1"
  __DEBUGINFO = /Zi
  !endif
  !if "$(DEBUG_INFO)" == "1"
  __DEBUGINFO = /Zi
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = /D_DEBUG
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG
  !endif
  !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO = /D_DEBUG
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG
  !endif
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3_0 = d
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
  !endif
  !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3_0 = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_3_0 = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_3_0 = d
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
  !endif
  !if "$(BUILD)" == "debug"
  __OPTIMIZEFLAG = /Od
  !endif
  !if "$(BUILD)" == "debug"
  __OPTIMIZEFLAG = /Od
@@ -3505,23 +3427,23 @@ __OPTIMIZEFLAG = /Od
  !if "$(BUILD)" == "release"
  __OPTIMIZEFLAG = /O2
  !endif
  !if "$(BUILD)" == "release"
  __OPTIMIZEFLAG = /O2
  !endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = D
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L
  !endif
  !endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = T
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T
  !endif
  !endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG = 
  !endif
  !endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /GR
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_3 = 
+__EXCEPTIONSFLAG = 
  !endif
  !if "$(USE_EXCEPTIONS)" == "1"
  !endif
  !if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_3 = /GX
+__EXCEPTIONSFLAG = /EHsc
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
  __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
  __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
@@ -3538,14 +3460,20 @@ __DEBUG_DEFINE_p = /D__WXDEBUG__
  !if "$(DEBUG_FLAG)" == "1"
  __DEBUG_DEFINE_p = /D__WXDEBUG__
  !endif
  !if "$(DEBUG_FLAG)" == "1"
  __DEBUG_DEFINE_p = /D__WXDEBUG__
  !endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
  !if "$(UNICODE)" == "1"
  __UNICODE_DEFINE_p = /D_UNICODE
  !endif
  !if "$(UNICODE)" == "1"
  __UNICODE_DEFINE_p = /D_UNICODE
  !endif
-!if "$(SHARED)" == "0"
-LIBDIRNAME = ..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = ..\..\lib\vc_dll$(CFG)
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
  !endif
  !if "$(WXUNIV)" == "0"
  __SETUP_H_SUBDIR_FILENAMES = msw
  !endif
  !if "$(WXUNIV)" == "0"
  __SETUP_H_SUBDIR_FILENAMES = msw
@@ -3561,75 +3489,81 @@ $(OBJS):
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
  
  clean: 
         -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
         -if exist $(OBJS)\*.res del $(OBJS)\*.res
  
  clean: 
         -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
         -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
         -if exist $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
         -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
         cd ..\..\samples
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
         cd ..\..\samples
@@ -3640,20 +3574,20 @@ setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h
  
  $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS)
         if exist $@ del $@
  
  $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXREGEX_OBJECTS)
  <<
  
  $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
         if exist $@ del $@
         $(WXREGEX_OBJECTS)
  <<
  
  $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXZLIB_OBJECTS)
  <<
  
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS)
         if exist $@ del $@
         $(WXZLIB_OBJECTS)
  <<
  
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXPNG_OBJECTS)
  <<
  !endif
         $(WXPNG_OBJECTS)
  <<
  !endif
@@ -3661,7 +3595,7 @@ $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS)
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
         if exist $@ del $@
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXJPEG_OBJECTS)
  <<
  !endif
         $(WXJPEG_OBJECTS)
  <<
  !endif
@@ -3669,35 +3603,35 @@ $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib: $(WXTIFF_OBJECTS)
         if exist $@ del $@
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib: $(WXTIFF_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXTIFF_OBJECTS)
  <<
  !endif
  
  $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
         if exist $@ del $@
         $(WXTIFF_OBJECTS)
  <<
  !endif
  
  $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXEXPAT_OBJECTS)
  <<
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
         $(WXEXPAT_OBJECTS)
  <<
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib       /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(OBJS)\monodll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib      /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\monolib_dummy.obj  $(MONOLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\monolib_dummy.obj  $(MONOLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(MONOLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
         $(MONOLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(OBJS)\basedll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
         $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
@@ -3705,14 +3639,14 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(BASELIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
         $(BASELIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(OBJS)\netdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  <<
  !endif
         $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  <<
  !endif
@@ -3720,14 +3654,14 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(NETLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
         $(NETLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(OBJS)\coredll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  <<
  !endif
         $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  <<
  !endif
@@ -3735,29 +3669,29 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib: $(OBJS)\corelib_dummy.obj  $(CORELIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib: $(OBJS)\corelib_dummy.obj  $(CORELIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(CORELIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
         $(CORELIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib   /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(OBJS)\advdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib: $(OBJS)\advlib_dummy.obj  $(ADVLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib: $(OBJS)\advlib_dummy.obj  $(ADVLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(ADVLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
         $(ADVLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(MEDIADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  <<
  !endif
         $(MEDIADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  <<
  !endif
@@ -3765,14 +3699,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj  $(MEDIALIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj  $(MEDIALIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(MEDIALIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
         $(MEDIALIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(ODBCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  <<
  !endif
         $(ODBCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  <<
  !endif
@@ -3780,14 +3714,14 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(ODBCLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
         $(ODBCLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  <<
  !endif
         $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  <<
  !endif
@@ -3795,14 +3729,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(DBGRIDLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
         $(DBGRIDLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  <<
  !endif
         $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  <<
  !endif
@@ -3810,14 +3744,29 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib: $(OBJS)\htmllib_dummy.obj  $(HTMLLIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib: $(OBJS)\htmllib_dummy.obj  $(HTMLLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(HTMLLIB_OBJECTS)
  <<
  !endif
  
         $(HTMLLIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(QADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib: $(OBJS)\qalib_dummy.obj  $(QALIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(QALIB_OBJECTS)
+<<
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  <<
  !endif
         $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  <<
  !endif
@@ -3825,14 +3774,14 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(XMLLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
         $(XMLLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(XRCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  <<
  !endif
         $(XRCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  <<
  !endif
@@ -3840,14 +3789,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib: $(OBJS)\xrclib_dummy.obj  $(XRCLIB_OBJECTS)
         if exist $@ del $@
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib: $(OBJS)\xrclib_dummy.obj  $(XRCLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(XRCLIB_OBJECTS)
  <<
  !endif
  
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
         $(XRCLIB_OBJECTS)
  <<
  !endif
  
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(OBJS)\gldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  /LIBPATH:$(LIBDIRNAME) @<<
         $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  <<
  !endif
         $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  <<
  !endif
@@ -3855,7 +3804,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
  !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib: $(OBJS)\gllib_dummy.obj  $(GLLIB_OBJECTS)
         if exist $@ del $@
  !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib: $(OBJS)\gllib_dummy.obj  $(GLLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(GLLIB_OBJECTS)
  <<
  !endif
         $(GLLIB_OBJECTS)
  <<
  !endif
@@ -3882,8 +3831,8 @@ $(SETUPHDIR)\wx\setup.h:
  
  build_cfg_file: $(SETUPHDIR)
         @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
  
  build_cfg_file: $(SETUPHDIR)
         @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
-       @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
-       @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
+       @echo WXVER_MINOR=6 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
         @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
         @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
         @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
         @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
         @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
         @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -3897,10 +3846,12 @@ build_cfg_file: $(SETUPHDIR)
         @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
         @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
         @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
         @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
         @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
         @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
+       @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
         @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
         @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
         @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
         @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
         @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
         @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
         @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
         @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
+       @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
         @echo COMPILER=vc >>$(BUILD_CFG_FILE)
         @echo CC=$(CC) >>$(BUILD_CFG_FILE)
         @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
         @echo COMPILER=vc >>$(BUILD_CFG_FILE)
         @echo CC=$(CC) >>$(BUILD_CFG_FILE)
         @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
@@ -4182,6 +4133,9 @@ $(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\tif_dumpmode.c
  $(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\tif_error.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
  $(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\tif_error.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
+$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\tif_extension.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+
  $(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\tif_fax3.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
  $(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\tif_fax3.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
@@ -4260,6 +4214,9 @@ $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c
  $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+
  $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4431,12 +4388,18 @@ $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
  $(OBJS)\monodll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4449,6 +4412,9 @@ $(OBJS)\monodll_registry.obj: ..\..\src\msw\registry.cpp
  $(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4653,46 +4619,7 @@ $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
  $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
+$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
@@ -4701,6 +4628,9 @@ $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
  $(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4773,6 +4703,12 @@ $(OBJS)\monodll_db.obj: ..\..\src\common\db.cpp
  $(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4797,15 +4733,24 @@ $(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
  $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4818,6 +4763,9 @@ $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
  $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5730,147 +5678,227 @@ $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
+$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treebase.obj: ..\..\src\common\treebase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_valgen.obj: ..\..\src\common\valgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_validate.obj: ..\..\src\common\validate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treebase.obj: ..\..\src\common\treebase.cpp
+$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_valgen.obj: ..\..\src\common\valgen.cpp
+$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_validate.obj: ..\..\src\common\validate.cpp
+$(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp
+$(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp
+$(OBJS)\monodll_selstore.obj: ..\..\src\generic\selstore.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
+$(OBJS)\monodll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
+$(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
+$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+$(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
+$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp
+$(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
+$(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
+$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp
+$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
+$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp
+$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
+$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
+$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp
+$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp
+$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_selstore.obj: ..\..\src\generic\selstore.cpp
+$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
+$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
+$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
+$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
@@ -6048,12 +6076,18 @@ $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
  $(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6066,6 +6100,9 @@ $(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp
  $(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6270,46 +6307,7 @@ $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
  $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
+$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
@@ -6318,6 +6316,9 @@ $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
  $(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6390,6 +6391,12 @@ $(OBJS)\monolib_db.obj: ..\..\src\common\db.cpp
  $(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6414,15 +6421,24 @@ $(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
  $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6435,6 +6451,9 @@ $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
  $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -7491,9 +7510,92 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+
  $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -7665,12 +7767,18 @@ $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
  $(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -7683,6 +7791,9 @@ $(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp
  $(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -7890,12 +8001,18 @@ $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
  $(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -7908,6 +8025,9 @@ $(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp
  $(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -7944,6 +8064,9 @@ $(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp
  $(OBJS)\netdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\netdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) $**
+
  $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
  $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
@@ -8022,6 +8145,9 @@ $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
  $(OBJS)\coredll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\coredll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) $**
+
  $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -10290,9 +10416,18 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
  $(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) $**
+
+$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -10308,6 +10443,9 @@ $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
  $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -10335,9 +10473,15 @@ $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
  $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -10353,6 +10497,9 @@ $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
  $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -10380,12 +10527,18 @@ $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
  $(OBJS)\mediadll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\mediadll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) $**
+
  $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
  
  $(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
  
  $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
  
  $(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
  
+$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+
  $(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
@@ -10395,9 +10548,15 @@ $(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
  $(OBJS)\medialib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
  
  $(OBJS)\medialib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
  
+$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+
  $(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG) $**
+
  $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
  
  $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
  
@@ -10416,6 +10575,9 @@ $(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp
  $(OBJS)\dbgriddll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\dbgriddll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG) $**
+
  $(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
  
  $(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
  
@@ -10428,6 +10590,9 @@ $(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
  $(OBJS)\htmldll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\htmldll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) $**
+
  $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
  $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
@@ -10563,9 +10728,33 @@ $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp
  $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
  $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
+$(OBJS)\qadll_dummy.obj: ..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) $**
+
+$(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
+
+$(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
+
+$(OBJS)\qalib_dummy.obj: ..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) $**
+
+$(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) $**
+
  $(OBJS)\xmldll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\xmldll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) $**
+
  $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
  
  $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
  
@@ -10584,6 +10773,9 @@ $(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
  $(OBJS)\xrcdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\xrcdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) $**
+
  $(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -10605,15 +10797,24 @@ $(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
  $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -10626,6 +10827,9 @@ $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
  $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -10725,15 +10929,24 @@ $(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
  $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -10746,6 +10959,9 @@ $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
  $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -10824,6 +11040,9 @@ $(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
  $(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) $(__MSLU_DEFINE_p_49) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) $**
+
  $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**
  
  $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**