fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

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

index 784cac14d44c8af0b8db09f71131684aabc4d6d1..561dba04f82405ca7aa5342eebb6e7971724fec1 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -13,38 +13,38 @@
  ### Variables: ###
  
  MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
         WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
-       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_QA="$(USE_QA)" \
+       TARGET_CPU="$(TARGET_CPU)" 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_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" 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)"
-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 27
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
  OBJS = \
-       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
+       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = ..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO) /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)
+WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
+       $(____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
-WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME_16) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_15_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) \
-       $(CFLAGS)
+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 \
         $(OBJS)\wxzlib_compress.obj \
@@ -58,10 +58,9 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_infback.obj \
         $(OBJS)\wxzlib_inftrees.obj \
         $(OBJS)\wxzlib_inffast.obj
-WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME_29) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_28_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
+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 \
         $(OBJS)\wxpng_pngerror.obj \
@@ -80,10 +79,9 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwrite.obj \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
-WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME_42) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_41_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
+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 \
         $(OBJS)\wxjpeg_jutils.obj \
@@ -131,10 +129,10 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jquant1.obj \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
-WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME_55) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_54_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I..\..\src\zlib /I..\..\src\jpeg $(CPPFLAGS) $(CFLAGS)
+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 =  \
         $(OBJS)\wxtiff_tif_win32.obj \
         $(OBJS)\wxtiff_tif_aux.obj \
@@ -148,6 +146,7 @@ WXTIFF_OBJECTS =  \
         $(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 \
@@ -170,33 +169,34 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_warning.obj \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
-WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME_68) /DWIN32 \
+WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_67_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I$(LIBDIRNAME) /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
-MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME_82) /DWIN32 \
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_81_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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_82) /DWIN32 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_81_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\monodll_version.res \
@@ -205,6 +205,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_clntdata.obj \
         $(OBJS)\monodll_cmdline.obj \
         $(OBJS)\monodll_config.obj \
+       $(OBJS)\monodll_convauto.obj \
         $(OBJS)\monodll_datetime.obj \
         $(OBJS)\monodll_datstrm.obj \
         $(OBJS)\monodll_dircmn.obj \
@@ -234,6 +235,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_module.obj \
         $(OBJS)\monodll_mstream.obj \
         $(OBJS)\monodll_object.obj \
+       $(OBJS)\monodll_powercmn.obj \
         $(OBJS)\monodll_process.obj \
         $(OBJS)\monodll_regex.obj \
         $(OBJS)\monodll_stdpbase.obj \
@@ -262,6 +264,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dir.obj \
         $(OBJS)\monodll_dlmsw.obj \
         $(OBJS)\monodll_mimetype.obj \
+       $(OBJS)\monodll_power.obj \
         $(OBJS)\monodll_regconf.obj \
         $(OBJS)\monodll_registry.obj \
         $(OBJS)\monodll_snglinst.obj \
@@ -292,25 +295,25 @@ MONODLL_OBJECTS =  \
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj \
         $(OBJS)\monodll_xtixml.obj
-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME_95) /DWIN32 \
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_94_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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_95) /DWIN32 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
-       $(____DEBUGRUNTIME_94_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
@@ -318,6 +321,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_clntdata.obj \
         $(OBJS)\monolib_cmdline.obj \
         $(OBJS)\monolib_config.obj \
+       $(OBJS)\monolib_convauto.obj \
         $(OBJS)\monolib_datetime.obj \
         $(OBJS)\monolib_datstrm.obj \
         $(OBJS)\monolib_dircmn.obj \
@@ -347,6 +351,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_module.obj \
         $(OBJS)\monolib_mstream.obj \
         $(OBJS)\monolib_object.obj \
+       $(OBJS)\monolib_powercmn.obj \
         $(OBJS)\monolib_process.obj \
         $(OBJS)\monolib_regex.obj \
         $(OBJS)\monolib_stdpbase.obj \
@@ -375,6 +380,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dir.obj \
         $(OBJS)\monolib_dlmsw.obj \
         $(OBJS)\monolib_mimetype.obj \
+       $(OBJS)\monolib_power.obj \
         $(OBJS)\monolib_regconf.obj \
         $(OBJS)\monolib_registry.obj \
         $(OBJS)\monolib_snglinst.obj \
@@ -405,26 +411,27 @@ MONOLIB_OBJECTS =  \
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj \
         $(OBJS)\monolib_xtixml.obj
-BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME_109) /DWIN32 \
+BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_108_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_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) \
-       /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_109) /DWIN32 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_108_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\basedll_version.res \
@@ -433,6 +440,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_clntdata.obj \
         $(OBJS)\basedll_cmdline.obj \
         $(OBJS)\basedll_config.obj \
+       $(OBJS)\basedll_convauto.obj \
         $(OBJS)\basedll_datetime.obj \
         $(OBJS)\basedll_datstrm.obj \
         $(OBJS)\basedll_dircmn.obj \
@@ -462,6 +470,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_module.obj \
         $(OBJS)\basedll_mstream.obj \
         $(OBJS)\basedll_object.obj \
+       $(OBJS)\basedll_powercmn.obj \
         $(OBJS)\basedll_process.obj \
         $(OBJS)\basedll_regex.obj \
         $(OBJS)\basedll_stdpbase.obj \
@@ -490,6 +499,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dir.obj \
         $(OBJS)\basedll_dlmsw.obj \
         $(OBJS)\basedll_mimetype.obj \
+       $(OBJS)\basedll_power.obj \
         $(OBJS)\basedll_regconf.obj \
         $(OBJS)\basedll_registry.obj \
         $(OBJS)\basedll_snglinst.obj \
@@ -505,25 +515,26 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_main.obj \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME_122) /DWIN32 \
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_121_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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_122) /DWIN32 \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
-       $(____DEBUGRUNTIME_121_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
@@ -531,6 +542,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_clntdata.obj \
         $(OBJS)\baselib_cmdline.obj \
         $(OBJS)\baselib_config.obj \
+       $(OBJS)\baselib_convauto.obj \
         $(OBJS)\baselib_datetime.obj \
         $(OBJS)\baselib_datstrm.obj \
         $(OBJS)\baselib_dircmn.obj \
@@ -560,6 +572,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_module.obj \
         $(OBJS)\baselib_mstream.obj \
         $(OBJS)\baselib_object.obj \
+       $(OBJS)\baselib_powercmn.obj \
         $(OBJS)\baselib_process.obj \
         $(OBJS)\baselib_regex.obj \
         $(OBJS)\baselib_stdpbase.obj \
@@ -588,6 +601,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dir.obj \
         $(OBJS)\baselib_dlmsw.obj \
         $(OBJS)\baselib_mimetype.obj \
+       $(OBJS)\baselib_power.obj \
         $(OBJS)\baselib_regconf.obj \
         $(OBJS)\baselib_registry.obj \
         $(OBJS)\baselib_snglinst.obj \
@@ -603,17 +617,17 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
-NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_141)$(__DEBUGRUNTIME_136) /DWIN32 \
+NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_141)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_135_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\netdll_version.res \
@@ -629,16 +643,16 @@ NETDLL_OBJECTS =  \
         $(OBJS)\netdll_url.obj \
         $(OBJS)\netdll_gsocket.obj \
         $(OBJS)\netdll_urlmsw.obj
-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME_149) /DWIN32 \
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
-       $(____DEBUGRUNTIME_148_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
@@ -653,17 +667,17 @@ NETLIB_OBJECTS =  \
         $(OBJS)\netlib_url.obj \
         $(OBJS)\netlib_gsocket.obj \
         $(OBJS)\netlib_urlmsw.obj
-COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_168)$(__DEBUGRUNTIME_163) /DWIN32 \
+COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_168)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_162_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\coredll_version.res \
@@ -675,16 +689,16 @@ COREDLL_OBJECTS =  \
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME_176) /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 \
-       $(____DEBUGRUNTIME_175_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
@@ -695,136 +709,146 @@ CORELIB_OBJECTS =  \
         $(OBJS)\corelib_mslu.obj \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
-ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_195)$(__DEBUGRUNTIME_190) /DWIN32 \
+ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_195)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_189_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\advdll_version.res \
         $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME_203) /DWIN32 \
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
-       $(____DEBUGRUNTIME_202_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
-MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_222)$(__DEBUGRUNTIME_217) /DWIN32 \
+MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_222)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_216_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\mediadll_version.res \
         $(OBJS)\mediadll_mediactrlcmn.obj \
-       $(OBJS)\mediadll_mediactrl.obj
-MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME_230) /DWIN32 \
+       $(OBJS)\mediadll_mediactrl_am.obj \
+       $(OBJS)\mediadll_mediactrl_wmp10.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 \
-       $(____DEBUGRUNTIME_229_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
-       $(OBJS)\medialib_mediactrl.obj
-ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_249)$(__DEBUGRUNTIME_244) /DWIN32 \
+       $(OBJS)\medialib_mediactrl_am.obj \
+       $(OBJS)\medialib_mediactrl_wmp10.obj \
+       $(OBJS)\medialib_activex.obj
+ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_249)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_243_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\odbcdll_version.res \
         $(OBJS)\odbcdll_db.obj \
         $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME_257) /DWIN32 \
+ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \
-       $(____DEBUGRUNTIME_256_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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
-DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_276)$(__DEBUGRUNTIME_271) /DWIN32 \
+DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_276)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_270_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\dbgriddll_version.res \
         $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME_284) /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 \
-       $(____DEBUGRUNTIME_283_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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
-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_303)$(__DEBUGRUNTIME_298) /DWIN32 \
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_303)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_297_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\htmldll_version.res \
         $(OBJS)\htmldll_helpbest.obj \
         $(OBJS)\htmldll_helpctrl.obj \
         $(OBJS)\htmldll_helpdata.obj \
+       $(OBJS)\htmldll_helpdlg.obj \
         $(OBJS)\htmldll_helpfrm.obj \
+       $(OBJS)\htmldll_helpwnd.obj \
         $(OBJS)\htmldll_htmlcell.obj \
         $(OBJS)\htmldll_htmlfilt.obj \
         $(OBJS)\htmldll_htmlpars.obj \
@@ -843,22 +867,24 @@ HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_m_tables.obj \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME_311) /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 \
-       $(____DEBUGRUNTIME_310_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\htmllib_helpbest.obj \
         $(OBJS)\htmllib_helpctrl.obj \
         $(OBJS)\htmllib_helpdata.obj \
+       $(OBJS)\htmllib_helpdlg.obj \
         $(OBJS)\htmllib_helpfrm.obj \
+       $(OBJS)\htmllib_helpwnd.obj \
         $(OBJS)\htmllib_htmlcell.obj \
         $(OBJS)\htmllib_htmlfilt.obj \
         $(OBJS)\htmllib_htmlpars.obj \
@@ -877,75 +903,77 @@ HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
-QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_330)$(__DEBUGRUNTIME_325) /DWIN32 \
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_330)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_324_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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)
  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_338) /DWIN32 \
+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_337_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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_352) /DWIN32 \
+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_351_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\xmldll_version.res \
         $(OBJS)\xmldll_xml.obj \
         $(OBJS)\xmldll_xtixml.obj
-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME_365) /DWIN32 \
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
-       $(____DEBUGRUNTIME_364_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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
-XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_384)$(__DEBUGRUNTIME_379) /DWIN32 \
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_384)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_378_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\xrcdll_version.res \
@@ -964,7 +992,9 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_mdi.obj \
         $(OBJS)\xrcdll_xh_gauge.obj \
         $(OBJS)\xrcdll_xh_gdctl.obj \
+       $(OBJS)\xrcdll_xh_grid.obj \
         $(OBJS)\xrcdll_xh_html.obj \
+       $(OBJS)\xrcdll_xh_hyperlink.obj \
         $(OBJS)\xrcdll_xh_listb.obj \
         $(OBJS)\xrcdll_xh_listbk.obj \
         $(OBJS)\xrcdll_xh_listc.obj \
@@ -988,19 +1018,20 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_tglbtn.obj \
         $(OBJS)\xrcdll_xh_toolb.obj \
         $(OBJS)\xrcdll_xh_tree.obj \
+       $(OBJS)\xrcdll_xh_treebk.obj \
         $(OBJS)\xrcdll_xh_unkwn.obj \
         $(OBJS)\xrcdll_xh_wizrd.obj \
         $(OBJS)\xrcdll_xmlres.obj \
         $(OBJS)\xrcdll_xmlrsall.obj
-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME_392) /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 \
-       $(____DEBUGRUNTIME_391_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
@@ -1019,7 +1050,9 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_mdi.obj \
         $(OBJS)\xrclib_xh_gauge.obj \
         $(OBJS)\xrclib_xh_gdctl.obj \
+       $(OBJS)\xrclib_xh_grid.obj \
         $(OBJS)\xrclib_xh_html.obj \
+       $(OBJS)\xrclib_xh_hyperlink.obj \
         $(OBJS)\xrclib_xh_listb.obj \
         $(OBJS)\xrclib_xh_listbk.obj \
         $(OBJS)\xrclib_xh_listc.obj \
@@ -1043,33 +1076,35 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_tglbtn.obj \
         $(OBJS)\xrclib_xh_toolb.obj \
         $(OBJS)\xrclib_xh_tree.obj \
+       $(OBJS)\xrclib_xh_treebk.obj \
         $(OBJS)\xrclib_xh_unkwn.obj \
         $(OBJS)\xrclib_xh_wizrd.obj \
         $(OBJS)\xrclib_xmlres.obj \
         $(OBJS)\xrclib_xmlrsall.obj
-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_411)$(__DEBUGRUNTIME_406) /DWIN32 \
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_411)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_405_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) \
-       /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)
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
         $(OBJS)\gldll_version.res \
         $(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME_419) /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 \
-       $(____DEBUGRUNTIME_418_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____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) \
-       /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" \
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /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 \
@@ -1102,6 +1137,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -1111,23 +1158,17 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
  !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_34)
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_8 = D
@@ -1135,24 +1176,6 @@ __RUNTIME_LIBS_8 = D
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_8 = $(__THREADSFLAG)
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_15_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_15_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_15_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_16 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_16 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_16 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_21 = D
  !endif
@@ -1162,24 +1185,6 @@ __RUNTIME_LIBS_21 = $(__THREADSFLAG)
  !if "$(USE_GUI)" == "1"
  __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_28_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_28_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_28_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_29 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_29 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_29 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_34 = D
  !endif
@@ -1189,24 +1194,6 @@ __RUNTIME_LIBS_34 = $(__THREADSFLAG)
  !if "$(USE_GUI)" == "1"
  __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_41_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_41_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_41_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_42 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_42 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_42 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_47 = D
  !endif
@@ -1216,48 +1203,12 @@ __RUNTIME_LIBS_47 = $(__THREADSFLAG)
  !if "$(USE_GUI)" == "1"
  __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_54_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_54_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_54_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_55 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_55 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_55 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_60 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_60 = $(__THREADSFLAG)
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_67_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_67_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_67_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_68 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_68 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_68 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_73 = D
  !endif
@@ -1272,34 +1223,7 @@ EXTRALIBS_FOR_BASE =
  !endif
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
  __monodll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_81_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_81_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_81_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_81_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_81_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_81_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_82 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_82 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_82 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_87 = D
@@ -1312,11 +1236,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_OBJECTS) \
         $(____ADVANCED_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_mediactrlcmn.obj \
-       $(OBJS)\monodll_mediactrl.obj \
+       $(OBJS)\monodll_mediactrl_am.obj \
+       $(OBJS)\monodll_mediactrl_wmp10.obj \
+       $(OBJS)\monodll_activex.obj \
         $(OBJS)\monodll_helpbest.obj \
         $(OBJS)\monodll_helpctrl.obj \
         $(OBJS)\monodll_helpdata.obj \
+       $(OBJS)\monodll_helpdlg.obj \
         $(OBJS)\monodll_helpfrm.obj \
+       $(OBJS)\monodll_helpwnd.obj \
         $(OBJS)\monodll_htmlcell.obj \
         $(OBJS)\monodll_htmlfilt.obj \
         $(OBJS)\monodll_htmlpars.obj \
@@ -1355,7 +1283,9 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_mdi.obj \
         $(OBJS)\monodll_xh_gauge.obj \
         $(OBJS)\monodll_xh_gdctl.obj \
+       $(OBJS)\monodll_xh_grid.obj \
         $(OBJS)\monodll_xh_html.obj \
+       $(OBJS)\monodll_xh_hyperlink.obj \
         $(OBJS)\monodll_xh_listb.obj \
         $(OBJS)\monodll_xh_listbk.obj \
         $(OBJS)\monodll_xh_listc.obj \
@@ -1379,6 +1309,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_tglbtn.obj \
         $(OBJS)\monodll_xh_toolb.obj \
         $(OBJS)\monodll_xh_tree.obj \
+       $(OBJS)\monodll_xh_treebk.obj \
         $(OBJS)\monodll_xh_unkwn.obj \
         $(OBJS)\monodll_xh_wizrd.obj \
         $(OBJS)\monodll_xmlres.obj \
@@ -1440,9 +1371,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_bmpbuttn.obj \
         $(OBJS)\monodll_button.obj \
         $(OBJS)\monodll_checkbox.obj \
-       $(OBJS)\monodll_checklst.obj \
         $(OBJS)\monodll_choice.obj \
         $(OBJS)\monodll_colordlg.obj \
+       $(OBJS)\monodll_combo.obj \
         $(OBJS)\monodll_combobox.obj \
         $(OBJS)\monodll_control.obj \
         $(OBJS)\monodll_dialog.obj \
@@ -1480,6 +1411,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_tglbtn.obj \
         $(OBJS)\monodll_treectrl.obj \
+       $(OBJS)\monodll_checklst.obj \
         $(OBJS)\monodll_fdrepdlg.obj \
         $(OBJS)\monodll_fontdlg.obj \
         $(OBJS)\monodll_accesscmn.obj \
@@ -1490,6 +1422,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_bookctrl.obj \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
+       $(OBJS)\monodll_colourcmn.obj \
+       $(OBJS)\monodll_combocmn.obj \
         $(OBJS)\monodll_cmdproc.obj \
         $(OBJS)\monodll_cmndata.obj \
         $(OBJS)\monodll_containr.obj \
@@ -1506,9 +1440,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dpycmn.obj \
         $(OBJS)\monodll_dseldlg.obj \
         $(OBJS)\monodll_effects.obj \
+       $(OBJS)\monodll_evtloopcmn.obj \
         $(OBJS)\monodll_fddlgcmn.obj \
         $(OBJS)\monodll_fldlgcmn.obj \
         $(OBJS)\monodll_fontcmn.obj \
+       $(OBJS)\monodll_fontenumcmn.obj \
         $(OBJS)\monodll_fontmap.obj \
         $(OBJS)\monodll_framecmn.obj \
         $(OBJS)\monodll_gaugecmn.obj \
@@ -1557,8 +1493,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_buttonbar.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
+       $(OBJS)\monodll_combog.obj \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
@@ -1575,7 +1513,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_splitter.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_toolbkg.obj \
         $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_treebkg.obj \
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
@@ -1671,6 +1611,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_stattext.obj \
         $(OBJS)\monodll_statusbr.obj \
         $(OBJS)\monodll_textctrl.obj \
+       $(OBJS)\monodll_tglbtn.obj \
         $(OBJS)\monodll_theme.obj \
         $(OBJS)\monodll_toolbar.obj \
         $(OBJS)\monodll_topluniv.obj \
@@ -1686,6 +1627,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_bookctrl.obj \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
+       $(OBJS)\monodll_colourcmn.obj \
+       $(OBJS)\monodll_combocmn.obj \
         $(OBJS)\monodll_cmdproc.obj \
         $(OBJS)\monodll_cmndata.obj \
         $(OBJS)\monodll_containr.obj \
@@ -1702,9 +1645,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dpycmn.obj \
         $(OBJS)\monodll_dseldlg.obj \
         $(OBJS)\monodll_effects.obj \
+       $(OBJS)\monodll_evtloopcmn.obj \
         $(OBJS)\monodll_fddlgcmn.obj \
         $(OBJS)\monodll_fldlgcmn.obj \
         $(OBJS)\monodll_fontcmn.obj \
+       $(OBJS)\monodll_fontenumcmn.obj \
         $(OBJS)\monodll_fontmap.obj \
         $(OBJS)\monodll_framecmn.obj \
         $(OBJS)\monodll_gaugecmn.obj \
@@ -1753,8 +1698,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_buttonbar.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
+       $(OBJS)\monodll_combog.obj \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
@@ -1771,24 +1718,35 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_splitter.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_toolbkg.obj \
         $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_treebkg.obj \
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_datavcmn.obj \
         $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datavgen.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_hyperlink.obj \
         $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_odcombo.obj \
         $(OBJS)\monodll_propdlg.obj \
         $(OBJS)\monodll_sashwin.obj \
         $(OBJS)\monodll_splash.obj \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
+       $(OBJS)\monodll_richtextctrl.obj \
+       $(OBJS)\monodll_richtextbuffer.obj \
+       $(OBJS)\monodll_richtextstyles.obj \
+       $(OBJS)\monodll_richtextxml.obj \
+       $(OBJS)\monodll_richtexthtml.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_taskbar.obj \
@@ -1797,18 +1755,27 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_datavcmn.obj \
         $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datavgen.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_hyperlink.obj \
         $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_odcombo.obj \
         $(OBJS)\monodll_propdlg.obj \
         $(OBJS)\monodll_sashwin.obj \
         $(OBJS)\monodll_splash.obj \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
+       $(OBJS)\monodll_richtextctrl.obj \
+       $(OBJS)\monodll_richtextbuffer.obj \
+       $(OBJS)\monodll_richtextstyles.obj \
+       $(OBJS)\monodll_richtextxml.obj \
+       $(OBJS)\monodll_richtexthtml.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_taskbar.obj \
@@ -1818,24 +1785,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
  __monolib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_94_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_94_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_94_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_95 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_95 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_95 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_100 = D
  !endif
@@ -1847,11 +1796,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_1_OBJECTS) \
         $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_mediactrlcmn.obj \
-       $(OBJS)\monolib_mediactrl.obj \
+       $(OBJS)\monolib_mediactrl_am.obj \
+       $(OBJS)\monolib_mediactrl_wmp10.obj \
+       $(OBJS)\monolib_activex.obj \
         $(OBJS)\monolib_helpbest.obj \
         $(OBJS)\monolib_helpctrl.obj \
         $(OBJS)\monolib_helpdata.obj \
+       $(OBJS)\monolib_helpdlg.obj \
         $(OBJS)\monolib_helpfrm.obj \
+       $(OBJS)\monolib_helpwnd.obj \
         $(OBJS)\monolib_htmlcell.obj \
         $(OBJS)\monolib_htmlfilt.obj \
         $(OBJS)\monolib_htmlpars.obj \
@@ -1890,7 +1843,9 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_mdi.obj \
         $(OBJS)\monolib_xh_gauge.obj \
         $(OBJS)\monolib_xh_gdctl.obj \
+       $(OBJS)\monolib_xh_grid.obj \
         $(OBJS)\monolib_xh_html.obj \
+       $(OBJS)\monolib_xh_hyperlink.obj \
         $(OBJS)\monolib_xh_listb.obj \
         $(OBJS)\monolib_xh_listbk.obj \
         $(OBJS)\monolib_xh_listc.obj \
@@ -1914,6 +1869,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_tglbtn.obj \
         $(OBJS)\monolib_xh_toolb.obj \
         $(OBJS)\monolib_xh_tree.obj \
+       $(OBJS)\monolib_xh_treebk.obj \
         $(OBJS)\monolib_xh_unkwn.obj \
         $(OBJS)\monolib_xh_wizrd.obj \
         $(OBJS)\monolib_xmlres.obj \
@@ -1975,9 +1931,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_bmpbuttn.obj \
         $(OBJS)\monolib_button.obj \
         $(OBJS)\monolib_checkbox.obj \
-       $(OBJS)\monolib_checklst.obj \
         $(OBJS)\monolib_choice.obj \
         $(OBJS)\monolib_colordlg.obj \
+       $(OBJS)\monolib_combo.obj \
         $(OBJS)\monolib_combobox.obj \
         $(OBJS)\monolib_control.obj \
         $(OBJS)\monolib_dialog.obj \
@@ -2015,6 +1971,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_tglbtn.obj \
         $(OBJS)\monolib_treectrl.obj \
+       $(OBJS)\monolib_checklst.obj \
         $(OBJS)\monolib_fdrepdlg.obj \
         $(OBJS)\monolib_fontdlg.obj \
         $(OBJS)\monolib_accesscmn.obj \
@@ -2025,6 +1982,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_bookctrl.obj \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
+       $(OBJS)\monolib_colourcmn.obj \
+       $(OBJS)\monolib_combocmn.obj \
         $(OBJS)\monolib_cmdproc.obj \
         $(OBJS)\monolib_cmndata.obj \
         $(OBJS)\monolib_containr.obj \
@@ -2041,9 +2000,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dpycmn.obj \
         $(OBJS)\monolib_dseldlg.obj \
         $(OBJS)\monolib_effects.obj \
+       $(OBJS)\monolib_evtloopcmn.obj \
         $(OBJS)\monolib_fddlgcmn.obj \
         $(OBJS)\monolib_fldlgcmn.obj \
         $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontenumcmn.obj \
         $(OBJS)\monolib_fontmap.obj \
         $(OBJS)\monolib_framecmn.obj \
         $(OBJS)\monolib_gaugecmn.obj \
@@ -2092,8 +2053,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_buttonbar.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
+       $(OBJS)\monolib_combog.obj \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
@@ -2110,7 +2073,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_splitter.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_toolbkg.obj \
         $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_treebkg.obj \
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
@@ -2206,6 +2171,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_stattext.obj \
         $(OBJS)\monolib_statusbr.obj \
         $(OBJS)\monolib_textctrl.obj \
+       $(OBJS)\monolib_tglbtn.obj \
         $(OBJS)\monolib_theme.obj \
         $(OBJS)\monolib_toolbar.obj \
         $(OBJS)\monolib_topluniv.obj \
@@ -2221,6 +2187,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_bookctrl.obj \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
+       $(OBJS)\monolib_colourcmn.obj \
+       $(OBJS)\monolib_combocmn.obj \
         $(OBJS)\monolib_cmdproc.obj \
         $(OBJS)\monolib_cmndata.obj \
         $(OBJS)\monolib_containr.obj \
@@ -2237,9 +2205,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dpycmn.obj \
         $(OBJS)\monolib_dseldlg.obj \
         $(OBJS)\monolib_effects.obj \
+       $(OBJS)\monolib_evtloopcmn.obj \
         $(OBJS)\monolib_fddlgcmn.obj \
         $(OBJS)\monolib_fldlgcmn.obj \
         $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontenumcmn.obj \
         $(OBJS)\monolib_fontmap.obj \
         $(OBJS)\monolib_framecmn.obj \
         $(OBJS)\monolib_gaugecmn.obj \
@@ -2288,8 +2258,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_buttonbar.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
+       $(OBJS)\monolib_combog.obj \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
@@ -2306,24 +2278,35 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_splitter.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_toolbkg.obj \
         $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_treebkg.obj \
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_datavcmn.obj \
         $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datavgen.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_hyperlink.obj \
         $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_odcombo.obj \
         $(OBJS)\monolib_propdlg.obj \
         $(OBJS)\monolib_sashwin.obj \
         $(OBJS)\monolib_splash.obj \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
+       $(OBJS)\monolib_richtextctrl.obj \
+       $(OBJS)\monolib_richtextbuffer.obj \
+       $(OBJS)\monolib_richtextstyles.obj \
+       $(OBJS)\monolib_richtextxml.obj \
+       $(OBJS)\monolib_richtexthtml.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_taskbar.obj \
@@ -2332,18 +2315,27 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_datavcmn.obj \
         $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datavgen.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_hyperlink.obj \
         $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_odcombo.obj \
         $(OBJS)\monolib_propdlg.obj \
         $(OBJS)\monolib_sashwin.obj \
         $(OBJS)\monolib_splash.obj \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
+       $(OBJS)\monolib_richtextctrl.obj \
+       $(OBJS)\monolib_richtextbuffer.obj \
+       $(OBJS)\monolib_richtextstyles.obj \
+       $(OBJS)\monolib_richtextxml.obj \
+       $(OBJS)\monolib_richtexthtml.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_taskbar.obj \
@@ -2351,34 +2343,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __basedll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_108_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_108_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_108_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_108_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_108_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_108_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_109 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_109 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_109 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_114 = D
@@ -2390,24 +2355,6 @@ __RUNTIME_LIBS_114 = $(__THREADSFLAG)
  __baselib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_121_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_121_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_121_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_122 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_122 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_122 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_127 = D
  !endif
@@ -2416,34 +2363,7 @@ __RUNTIME_LIBS_127 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __netdll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_135_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_135_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_135_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_135_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_135_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_135_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_136 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_136 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_136 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_141 = D
@@ -2455,24 +2375,6 @@ __RUNTIME_LIBS_141 = $(__THREADSFLAG)
  __netlib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_148_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_148_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_148_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_149 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_149 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_149 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_154 = D
  !endif
@@ -2481,34 +2383,7 @@ __RUNTIME_LIBS_154 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __coredll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
-!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_162_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_162_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_162_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_163 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_163 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_163 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_168 = D
@@ -2572,9 +2447,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_bmpbuttn.obj \
         $(OBJS)\coredll_button.obj \
         $(OBJS)\coredll_checkbox.obj \
-       $(OBJS)\coredll_checklst.obj \
         $(OBJS)\coredll_choice.obj \
         $(OBJS)\coredll_colordlg.obj \
+       $(OBJS)\coredll_combo.obj \
         $(OBJS)\coredll_combobox.obj \
         $(OBJS)\coredll_control.obj \
         $(OBJS)\coredll_dialog.obj \
@@ -2612,6 +2487,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_tglbtn.obj \
         $(OBJS)\coredll_treectrl.obj \
+       $(OBJS)\coredll_checklst.obj \
         $(OBJS)\coredll_fdrepdlg.obj \
         $(OBJS)\coredll_fontdlg.obj \
         $(OBJS)\coredll_accesscmn.obj \
@@ -2622,6 +2498,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_bookctrl.obj \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
+       $(OBJS)\coredll_colourcmn.obj \
+       $(OBJS)\coredll_combocmn.obj \
         $(OBJS)\coredll_cmdproc.obj \
         $(OBJS)\coredll_cmndata.obj \
         $(OBJS)\coredll_containr.obj \
@@ -2638,9 +2516,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dpycmn.obj \
         $(OBJS)\coredll_dseldlg.obj \
         $(OBJS)\coredll_effects.obj \
+       $(OBJS)\coredll_evtloopcmn.obj \
         $(OBJS)\coredll_fddlgcmn.obj \
         $(OBJS)\coredll_fldlgcmn.obj \
         $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontenumcmn.obj \
         $(OBJS)\coredll_fontmap.obj \
         $(OBJS)\coredll_framecmn.obj \
         $(OBJS)\coredll_gaugecmn.obj \
@@ -2689,8 +2569,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_buttonbar.obj \
         $(OBJS)\coredll_choicdgg.obj \
         $(OBJS)\coredll_choicbkg.obj \
+       $(OBJS)\coredll_combog.obj \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
@@ -2707,7 +2589,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_splitter.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_toolbkg.obj \
         $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_treebkg.obj \
         $(OBJS)\coredll_vlbox.obj \
         $(OBJS)\coredll_vscroll.obj
  !endif
@@ -2803,6 +2687,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_stattext.obj \
         $(OBJS)\coredll_statusbr.obj \
         $(OBJS)\coredll_textctrl.obj \
+       $(OBJS)\coredll_tglbtn.obj \
         $(OBJS)\coredll_theme.obj \
         $(OBJS)\coredll_toolbar.obj \
         $(OBJS)\coredll_topluniv.obj \
@@ -2818,6 +2703,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_bookctrl.obj \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
+       $(OBJS)\coredll_colourcmn.obj \
+       $(OBJS)\coredll_combocmn.obj \
         $(OBJS)\coredll_cmdproc.obj \
         $(OBJS)\coredll_cmndata.obj \
         $(OBJS)\coredll_containr.obj \
@@ -2834,9 +2721,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dpycmn.obj \
         $(OBJS)\coredll_dseldlg.obj \
         $(OBJS)\coredll_effects.obj \
+       $(OBJS)\coredll_evtloopcmn.obj \
         $(OBJS)\coredll_fddlgcmn.obj \
         $(OBJS)\coredll_fldlgcmn.obj \
         $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontenumcmn.obj \
         $(OBJS)\coredll_fontmap.obj \
         $(OBJS)\coredll_framecmn.obj \
         $(OBJS)\coredll_gaugecmn.obj \
@@ -2885,8 +2774,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_buttonbar.obj \
         $(OBJS)\coredll_choicdgg.obj \
         $(OBJS)\coredll_choicbkg.obj \
+       $(OBJS)\coredll_combog.obj \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
@@ -2903,7 +2794,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_splitter.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_toolbkg.obj \
         $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_treebkg.obj \
         $(OBJS)\coredll_vlbox.obj \
         $(OBJS)\coredll_vscroll.obj
  !endif
@@ -2911,24 +2804,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
  __corelib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_175_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_175_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_175_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_176 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_176 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_176 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_181 = D
  !endif
@@ -2991,9 +2866,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_bmpbuttn.obj \
         $(OBJS)\corelib_button.obj \
         $(OBJS)\corelib_checkbox.obj \
-       $(OBJS)\corelib_checklst.obj \
         $(OBJS)\corelib_choice.obj \
         $(OBJS)\corelib_colordlg.obj \
+       $(OBJS)\corelib_combo.obj \
         $(OBJS)\corelib_combobox.obj \
         $(OBJS)\corelib_control.obj \
         $(OBJS)\corelib_dialog.obj \
@@ -3031,6 +2906,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_tglbtn.obj \
         $(OBJS)\corelib_treectrl.obj \
+       $(OBJS)\corelib_checklst.obj \
         $(OBJS)\corelib_fdrepdlg.obj \
         $(OBJS)\corelib_fontdlg.obj \
         $(OBJS)\corelib_accesscmn.obj \
@@ -3041,6 +2917,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_bookctrl.obj \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
+       $(OBJS)\corelib_colourcmn.obj \
+       $(OBJS)\corelib_combocmn.obj \
         $(OBJS)\corelib_cmdproc.obj \
         $(OBJS)\corelib_cmndata.obj \
         $(OBJS)\corelib_containr.obj \
@@ -3057,9 +2935,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dpycmn.obj \
         $(OBJS)\corelib_dseldlg.obj \
         $(OBJS)\corelib_effects.obj \
+       $(OBJS)\corelib_evtloopcmn.obj \
         $(OBJS)\corelib_fddlgcmn.obj \
         $(OBJS)\corelib_fldlgcmn.obj \
         $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontenumcmn.obj \
         $(OBJS)\corelib_fontmap.obj \
         $(OBJS)\corelib_framecmn.obj \
         $(OBJS)\corelib_gaugecmn.obj \
@@ -3108,8 +2988,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_buttonbar.obj \
         $(OBJS)\corelib_choicdgg.obj \
         $(OBJS)\corelib_choicbkg.obj \
+       $(OBJS)\corelib_combog.obj \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
@@ -3126,7 +3008,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_splitter.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_toolbkg.obj \
         $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_treebkg.obj \
         $(OBJS)\corelib_vlbox.obj \
         $(OBJS)\corelib_vscroll.obj
  !endif
@@ -3222,6 +3106,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_stattext.obj \
         $(OBJS)\corelib_statusbr.obj \
         $(OBJS)\corelib_textctrl.obj \
+       $(OBJS)\corelib_tglbtn.obj \
         $(OBJS)\corelib_theme.obj \
         $(OBJS)\corelib_toolbar.obj \
         $(OBJS)\corelib_topluniv.obj \
@@ -3237,6 +3122,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_bookctrl.obj \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
+       $(OBJS)\corelib_colourcmn.obj \
+       $(OBJS)\corelib_combocmn.obj \
         $(OBJS)\corelib_cmdproc.obj \
         $(OBJS)\corelib_cmndata.obj \
         $(OBJS)\corelib_containr.obj \
@@ -3253,9 +3140,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dpycmn.obj \
         $(OBJS)\corelib_dseldlg.obj \
         $(OBJS)\corelib_effects.obj \
+       $(OBJS)\corelib_evtloopcmn.obj \
         $(OBJS)\corelib_fddlgcmn.obj \
         $(OBJS)\corelib_fldlgcmn.obj \
         $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontenumcmn.obj \
         $(OBJS)\corelib_fontmap.obj \
         $(OBJS)\corelib_framecmn.obj \
         $(OBJS)\corelib_gaugecmn.obj \
@@ -3304,8 +3193,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_buttonbar.obj \
         $(OBJS)\corelib_choicdgg.obj \
         $(OBJS)\corelib_choicbkg.obj \
+       $(OBJS)\corelib_combog.obj \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
@@ -3322,40 +3213,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_splitter.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_toolbkg.obj \
         $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_treebkg.obj \
         $(OBJS)\corelib_vlbox.obj \
         $(OBJS)\corelib_vscroll.obj
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __advdll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_189_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_189_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_189_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_189_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_189_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_189_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_190 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_190 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_190 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_195 = D
@@ -3365,18 +3231,27 @@ __RUNTIME_LIBS_195 = $(__THREADSFLAG)
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_datavcmn.obj \
         $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datavgen.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_hyperlink.obj \
         $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_odcombo.obj \
         $(OBJS)\advdll_propdlg.obj \
         $(OBJS)\advdll_sashwin.obj \
         $(OBJS)\advdll_splash.obj \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
+       $(OBJS)\advdll_richtextctrl.obj \
+       $(OBJS)\advdll_richtextbuffer.obj \
+       $(OBJS)\advdll_richtextstyles.obj \
+       $(OBJS)\advdll_richtextxml.obj \
+       $(OBJS)\advdll_richtexthtml.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_taskbar.obj \
@@ -3385,18 +3260,27 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_datavcmn.obj \
         $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datavgen.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_hyperlink.obj \
         $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_odcombo.obj \
         $(OBJS)\advdll_propdlg.obj \
         $(OBJS)\advdll_sashwin.obj \
         $(OBJS)\advdll_splash.obj \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
+       $(OBJS)\advdll_richtextctrl.obj \
+       $(OBJS)\advdll_richtextbuffer.obj \
+       $(OBJS)\advdll_richtextstyles.obj \
+       $(OBJS)\advdll_richtextxml.obj \
+       $(OBJS)\advdll_richtexthtml.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_taskbar.obj \
@@ -3406,24 +3290,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
  __advlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_202_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_202_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_202_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_203 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_203 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_203 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_208 = D
  !endif
@@ -3432,18 +3298,27 @@ __RUNTIME_LIBS_208 = $(__THREADSFLAG)
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_datavcmn.obj \
         $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datavgen.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_hyperlink.obj \
         $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_odcombo.obj \
         $(OBJS)\advlib_propdlg.obj \
         $(OBJS)\advlib_sashwin.obj \
         $(OBJS)\advlib_splash.obj \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
+       $(OBJS)\advlib_richtextctrl.obj \
+       $(OBJS)\advlib_richtextbuffer.obj \
+       $(OBJS)\advlib_richtextstyles.obj \
+       $(OBJS)\advlib_richtextxml.obj \
+       $(OBJS)\advlib_richtexthtml.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
         $(OBJS)\advlib_sound.obj \
         $(OBJS)\advlib_taskbar.obj \
@@ -3452,53 +3327,35 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_datavcmn.obj \
         $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datavgen.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_hyperlink.obj \
         $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_odcombo.obj \
         $(OBJS)\advlib_propdlg.obj \
         $(OBJS)\advlib_sashwin.obj \
         $(OBJS)\advlib_splash.obj \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
+       $(OBJS)\advlib_richtextctrl.obj \
+       $(OBJS)\advlib_richtextbuffer.obj \
+       $(OBJS)\advlib_richtextstyles.obj \
+       $(OBJS)\advlib_richtextxml.obj \
+       $(OBJS)\advlib_richtexthtml.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"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
  __mediadll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_216_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_216_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_216_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_216_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_216_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_216_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_217 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_217 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_217 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_222 = D
@@ -3506,28 +3363,10 @@ __RUNTIME_LIBS_222 = D
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_222 = $(__THREADSFLAG)
  !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
  __medialib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_229_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_229_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_229_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_230 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_230 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_230 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_235 = D
  !endif
@@ -3536,34 +3375,7 @@ __RUNTIME_LIBS_235 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
  __odbcdll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_243_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_243_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_243_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_243_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_243_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_243_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_244 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_244 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_244 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_249 = D
@@ -3575,24 +3387,6 @@ __RUNTIME_LIBS_249 = $(__THREADSFLAG)
  __odbclib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_256_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_256_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_256_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_257 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_257 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_257 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_262 = D
  !endif
@@ -3601,34 +3395,7 @@ __RUNTIME_LIBS_262 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  __dbgriddll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_270_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_270_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_270_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_270_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_270_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_270_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_271 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_271 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_271 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_276 = D
@@ -3640,24 +3407,6 @@ __RUNTIME_LIBS_276 = $(__THREADSFLAG)
  __dbgridlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_283_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_283_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_283_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_284 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_284 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_284 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_289 = D
  !endif
@@ -3666,34 +3415,7 @@ __RUNTIME_LIBS_289 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_297_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_297_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_297_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_297_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_297_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_297_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_298 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_298 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_298 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_303 = D
@@ -3705,24 +3427,6 @@ __RUNTIME_LIBS_303 = $(__THREADSFLAG)
  __htmllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_310_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_310_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_310_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_311 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_311 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_311 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_316 = D
  !endif
@@ -3731,34 +3435,7 @@ __RUNTIME_LIBS_316 = $(__THREADSFLAG)
  !endif
  !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
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_324_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_324_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_324_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_324_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_324_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_324_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_325 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_325 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_325 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_330 = D
@@ -3770,24 +3447,6 @@ __RUNTIME_LIBS_330 = $(__THREADSFLAG)
  __qalib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.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
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_338 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_343 = D
  !endif
@@ -3796,34 +3455,7 @@ __RUNTIME_LIBS_343 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __xmldll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_351_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_351_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_351_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_351_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_351_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_351_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_352 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_352 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_352 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_357 = D
@@ -3835,24 +3467,6 @@ __RUNTIME_LIBS_357 = $(__THREADSFLAG)
  __xmllib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_364_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_364_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_364_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_365 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_365 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_365 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_370 = D
  !endif
@@ -3861,62 +3475,17 @@ __RUNTIME_LIBS_370 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
  __xrcdll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_378_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_378_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_378_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_378_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_378_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_378_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_379 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_379 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_379 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_384 = D
-!endif
-!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
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_391_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_391_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_391_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_392 = 
+__RUNTIME_LIBS_384 = D
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_392 = d
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_384 = $(__THREADSFLAG)
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_392 = $(__DEBUGINFO_34)
+!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 "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_397 = D
@@ -3926,34 +3495,7 @@ __RUNTIME_LIBS_397 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  __gldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_405_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_405_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_405_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_405_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_405_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_405_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_406 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_406 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_406 = $(__DEBUGINFO_34)
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_411 = D
@@ -3977,24 +3519,6 @@ __WXLIB_MONO_p = \
  __gllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_418_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_418_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_418_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_419 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_419 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_419 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_424 = D
  !endif
@@ -4002,28 +3526,28 @@ __RUNTIME_LIBS_424 = D
  __RUNTIME_LIBS_424 = $(__THREADSFLAG)
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_32 = /DEBUG
+__DEBUGINFO_4 = /DEBUG
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_32 = 
+__DEBUGINFO_4 = 
  !endif
  !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_32 = 
+__DEBUGINFO_4 = 
  !endif
  !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_32 = /DEBUG
+__DEBUGINFO_4 = /DEBUG
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_4 = /d _DEBUG
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_4 = /d _DEBUG
  !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_4 = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_4 = 
  !endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_4 = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_4 = 
  !endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_4 = /d _DEBUG
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_4 = /d _DEBUG
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
  __NO_VC_CRTDBG_p_55 = /d __NO_VC_CRTDBG__
@@ -4052,6 +3576,9 @@ __THREAD_DEFINE_p_49 = /d wxNO_THREADS
  !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
@@ -4076,29 +3603,29 @@ __DEBUGINFO =
  !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
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = 
  !endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME = 
  !endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO = /D_DEBUG
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_34 = d
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
  !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_34 = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = 
  !endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_34 = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME = 
  !endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_34 = d
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
  !endif
  !if "$(BUILD)" == "debug"
  __OPTIMIZEFLAG = /Od
@@ -4151,6 +3678,9 @@ __THREAD_DEFINE_p = /DwxNO_THREADS
  !if "$(UNICODE)" == "1"
  __UNICODE_DEFINE_p = /D_UNICODE
  !endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
  !if "$(WXUNIV)" == "0"
  __SETUP_H_SUBDIR_FILENAMES = msw
  !endif
@@ -4177,93 +3707,93 @@ clean:
         -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_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_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).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_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_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).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)_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_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.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_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_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.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)_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_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.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)_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_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.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_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_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.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_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_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.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)_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_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.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)_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_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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_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)\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_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_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.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)_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_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.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
         $(MAKE) -f makefile.vc $(MAKEARGS) clean
         cd $(MAKEDIR)
  
-setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
+setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
  
  $(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 $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(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
@@ -4271,7 +3801,7 @@ $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS)
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXJPEG_OBJECTS)
  <<
  !endif
@@ -4279,208 +3809,208 @@ $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
  !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 $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXEXPAT_OBJECTS)
  <<
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
-$(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_32)  /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_VERSION_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)  $(LINK_TARGET_CPU) /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 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 $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(MONOLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(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_32)  /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
+$(LIBDIRNAME)\wxbase$(WX_VERSION_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)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(BASEDLL_OBJECTS)  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 odbc32.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
  
  !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"
-$(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_32)  /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
+$(LIBDIRNAME)\wxbase$(WX_VERSION_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)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(NETDLL_OBJECTS)  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 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
  
  !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"
-$(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_32)  /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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)  $(LINK_TARGET_CPU) /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 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
  
  !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"
-$(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_32)  /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_VERSION_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 $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /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 odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.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 $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(ADVLIB_OBJECTS)
  <<
  !endif
  
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(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_32)  /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
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)  $(LINK_TARGET_CPU) /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 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
  
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "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"
-$(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_32)  /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
+$(LIBDIRNAME)\wxbase$(WX_VERSION_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)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(ODBCDLL_OBJECTS)  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 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
  
  !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"
-$(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_32)  /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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)  $(LINK_TARGET_CPU) /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 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
  
  !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"
-$(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_32)  /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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)  $(LINK_TARGET_CPU) /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 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
  
  !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
  
  !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_32)  /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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)  $(LINK_TARGET_CPU) /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 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 $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(QALIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(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_32)  /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
+$(LIBDIRNAME)\wxbase$(WX_VERSION_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)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(XMLDLL_OBJECTS)  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 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
  
  !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"
-$(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_32)  /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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)  $(LINK_TARGET_CPU) /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 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
  
  !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"
-$(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_32)  /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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)  $(LINK_TARGET_CPU) /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 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
  
  !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
@@ -4505,9 +4035,15 @@ $(SETUPHDIR)\wx: $(SETUPHDIR)
  $(SETUPHDIR)\wx\setup.h: 
         if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
  
+$(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx
+       if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw
+
+$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h
+       $(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+
  build_cfg_file: $(SETUPHDIR)
         @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
-       @echo WXVER_MINOR=6 >>$(BUILD_CFG_FILE)
+       @echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE)
         @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
         @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
         @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@@ -4525,6 +4061,7 @@ build_cfg_file: $(SETUPHDIR)
         @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_MEDIA=$(USE_MEDIA) >>$(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)
@@ -4809,6 +4346,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_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) $**
  
@@ -4888,7 +4428,7 @@ $(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_81_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
  
  $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4905,6 +4445,9 @@ $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
  $(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4992,6 +4535,9 @@ $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp
  $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5076,6 +4622,9 @@ $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
  $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5160,6 +4709,9 @@ $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
  $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5214,9 +4766,6 @@ $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
  $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
  $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5298,7 +4847,13 @@ $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
  $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.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
@@ -5310,9 +4865,15 @@ $(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
  $(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5427,9 +4988,15 @@ $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
  $(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.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) $**
  
@@ -5499,6 +5066,9 @@ $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
  $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5812,16 +5382,6 @@ $(OBJS)\monodll_checkbox.obj: ..\..\src\univ\checkbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6002,6 +5562,26 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6052,6 +5632,16 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6132,6 +5722,11 @@ $(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6147,6 +5742,11 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6387,6 +5987,11 @@ $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.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) $**
@@ -6397,6 +6002,11 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.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) $**
@@ -6477,11 +6087,21 @@ $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6492,11 +6112,21 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6522,11 +6152,21 @@ $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6552,6 +6192,31 @@ $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6590,6 +6255,9 @@ $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
  $(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6677,6 +6345,9 @@ $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp
  $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6761,6 +6432,9 @@ $(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
  $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6845,6 +6519,9 @@ $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
  $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6899,9 +6576,6 @@ $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
  $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
  $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6983,7 +6657,13 @@ $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
  $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.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
@@ -6995,9 +6675,15 @@ $(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
  $(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -7112,9 +6798,15 @@ $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
  $(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.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) $**
  
@@ -7184,6 +6876,9 @@ $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
  $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -7497,16 +7192,6 @@ $(OBJS)\monolib_checkbox.obj: ..\..\src\univ\checkbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7687,6 +7372,26 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7737,6 +7442,16 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7817,6 +7532,11 @@ $(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7832,6 +7552,11 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8072,6 +7797,11 @@ $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8082,6 +7812,11 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8162,11 +7897,21 @@ $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8177,11 +7922,21 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+       $(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_datavgen.obj: ..\..\src\generic\datavgen.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) $**
@@ -8207,11 +7962,21 @@ $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hyperlink.obj: ..\..\src\generic\hyperlink.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_odcombo.obj: ..\..\src\generic\odcombo.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) $**
@@ -8237,6 +8002,31 @@ $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.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) $**
@@ -8261,7 +8051,7 @@ $(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_108_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
  
  $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
@@ -8278,6 +8068,9 @@ $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
  $(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8365,6 +8158,9 @@ $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp
  $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8449,6 +8245,9 @@ $(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
  $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8512,6 +8311,9 @@ $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
  $(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8599,6 +8401,9 @@ $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp
  $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8683,6 +8488,9 @@ $(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
  $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8732,7 +8540,7 @@ $(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_135_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_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) $**
@@ -8813,7 +8621,7 @@ $(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_162_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) $**
  
  $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -8839,6 +8647,9 @@ $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
  $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
+$(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+
  $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -8893,9 +8704,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
  $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
-$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
  $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -9266,16 +9074,6 @@ $(OBJS)\coredll_checkbox.obj: ..\..\src\univ\checkbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9456,6 +9254,26 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9506,6 +9324,16 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9586,6 +9414,11 @@ $(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9601,6 +9434,11 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9841,6 +9679,11 @@ $(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9851,6 +9694,11 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9931,11 +9779,21 @@ $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9973,6 +9831,9 @@ $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
  $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
+$(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+
  $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
@@ -10027,9 +9888,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
  $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
-$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
  $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
@@ -10400,16 +10258,6 @@ $(OBJS)\corelib_checkbox.obj: ..\..\src\univ\checkbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10590,6 +10438,26 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10640,6 +10508,16 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10720,6 +10598,11 @@ $(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10735,6 +10618,11 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10975,6 +10863,11 @@ $(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10985,6 +10878,11 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11065,11 +10963,21 @@ $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11084,14 +10992,20 @@ $(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_189_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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_datavcmn.obj: ..\..\src\common\datavcmn.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_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -11107,9 +11021,15 @@ $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp
  $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_hyperlink.obj: ..\..\src\generic\hyperlink.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_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -11125,6 +11045,21 @@ $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
  $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -11143,9 +11078,15 @@ $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
  $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.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_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -11161,9 +11102,15 @@ $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp
  $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_hyperlink.obj: ..\..\src\generic\hyperlink.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_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -11179,6 +11126,21 @@ $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
  $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -11195,12 +11157,18 @@ $(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_216_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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
+$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+
+$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.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
@@ -11209,14 +11177,20 @@ $(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
  $(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
  
-$(OBJS)\medialib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
+$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+
+$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.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_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_243_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG) $**
  
  $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
@@ -11237,7 +11211,7 @@ $(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_270_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG) $**
  
  $(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
@@ -11252,7 +11226,7 @@ $(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_297_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) $**
  
  $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
@@ -11263,9 +11237,15 @@ $(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
  $(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
+$(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+
  $(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
+$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+
  $(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
@@ -11332,9 +11312,15 @@ $(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
  $(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
+$(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+
  $(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
+$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+
  $(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
@@ -11393,7 +11379,7 @@ $(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_324_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) $**
  
  $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
@@ -11414,7 +11400,7 @@ $(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_351_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) $**
  
  $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
@@ -11435,7 +11421,7 @@ $(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_378_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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) $**
@@ -11482,9 +11468,15 @@ $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
  $(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.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) $**
  
@@ -11554,6 +11546,9 @@ $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
  $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -11614,9 +11609,15 @@ $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
  $(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.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) $**
  
@@ -11686,6 +11687,9 @@ $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
  $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -11702,7 +11706,7 @@ $(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_405_p_1) $(__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) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) $**
+       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 $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) $**
  
  $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**