wxPalmOS frame code clearning from MSW specific parts. Initial GetClientAreaOrigin...

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

index 6571f01c65f8b02f3db8b0fa609c4dfde8ea1ed0..aec0f5523f4e91283ab705c12e4519521421b823 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -17,25 +17,32 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
         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_OPENGL="$(USE_OPENGL)" \
-       USE_ODBC="$(USE_ODBC)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" CFG="$(CFG)" \
+       USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_XRC="$(USE_XRC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
+       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
         RUNTIME_LIBS="$(RUNTIME_LIBS)"
+WX_RELEASE_NODOT = 25
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
  OBJS = \
         vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
  WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_2_p) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\include /I$(SETUPHDIR) \
-       $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
+       /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_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
         $(OBJS)\wxregex_regexec.obj \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
-WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_13) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_12_p) \
+WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_14_p) \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
@@ -47,13 +54,11 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_trees.obj \
         $(OBJS)\wxzlib_zutil.obj \
         $(OBJS)\wxzlib_inflate.obj \
-       $(OBJS)\wxzlib_infblock.obj \
+       $(OBJS)\wxzlib_infback.obj \
         $(OBJS)\wxzlib_inftrees.obj \
-       $(OBJS)\wxzlib_infcodes.obj \
-       $(OBJS)\wxzlib_infutil.obj \
         $(OBJS)\wxzlib_inffast.obj
-WXPNG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_23) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_22_p) \
+WXPNG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_27) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_26_p) \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
@@ -73,8 +78,8 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwrite.obj \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
-WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_33) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_32_p) \
+WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_39) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_38_p) \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
@@ -123,8 +128,8 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jquant1.obj \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
-WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_42_p) \
+WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_50_p) \
         $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \
         $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
@@ -132,6 +137,7 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_aux.obj \
         $(OBJS)\wxtiff_tif_close.obj \
         $(OBJS)\wxtiff_tif_codec.obj \
+       $(OBJS)\wxtiff_tif_color.obj \
         $(OBJS)\wxtiff_tif_compress.obj \
         $(OBJS)\wxtiff_tif_dir.obj \
         $(OBJS)\wxtiff_tif_dirinfo.obj \
@@ -161,34 +167,36 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_warning.obj \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
-WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_53) /DWIN32 \
+WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_52_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       $(____LIBDIRNAME_FILENAMES_6_p) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       $(____DEBUGRUNTIME_62_p) $(__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)$(__DEBUGRUNTIME_63) /DWIN32 \
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_62_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_75_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)
-MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \
+MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_62_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_75_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 /DWXMAKINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \
+       /DwxUSE_BASE=1 /DWXMAKINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
  MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dummy.obj \
         $(OBJS)\monodll_appbase.obj \
+       $(OBJS)\monodll_archive.obj \
+       $(OBJS)\monodll_clntdata.obj \
         $(OBJS)\monodll_cmdline.obj \
         $(OBJS)\monodll_config.obj \
         $(OBJS)\monodll_datetime.obj \
@@ -207,7 +215,6 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_filesys.obj \
         $(OBJS)\monodll_fmapbase.obj \
         $(OBJS)\monodll_fs_zip.obj \
-       $(OBJS)\monodll_gzstream.obj \
         $(OBJS)\monodll_hash.obj \
         $(OBJS)\monodll_hashmap.obj \
         $(OBJS)\monodll_init.obj \
@@ -223,6 +230,8 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_object.obj \
         $(OBJS)\monodll_process.obj \
         $(OBJS)\monodll_regex.obj \
+       $(OBJS)\monodll_stdpbase.obj \
+       $(OBJS)\monodll_sstream.obj \
         $(OBJS)\monodll_stopwatch.obj \
         $(OBJS)\monodll_strconv.obj \
         $(OBJS)\monodll_stream.obj \
@@ -232,7 +241,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_textfile.obj \
         $(OBJS)\monodll_tokenzr.obj \
         $(OBJS)\monodll_txtstrm.obj \
-       $(OBJS)\monodll_unzip.obj \
+       $(OBJS)\monodll_uri.obj \
         $(OBJS)\monodll_variant.obj \
         $(OBJS)\monodll_wfstream.obj \
         $(OBJS)\monodll_wxchar.obj \
@@ -242,12 +251,16 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_zstream.obj \
         $(OBJS)\monodll_basemsw.obj \
         $(OBJS)\monodll_crashrpt.obj \
+       $(OBJS)\monodll_debughlp.obj \
         $(OBJS)\monodll_dde.obj \
         $(OBJS)\monodll_dir.obj \
+       $(OBJS)\monodll_dlmsw.obj \
         $(OBJS)\monodll_mimetype.obj \
         $(OBJS)\monodll_regconf.obj \
         $(OBJS)\monodll_registry.obj \
         $(OBJS)\monodll_snglinst.obj \
+       $(OBJS)\monodll_stackwalk.obj \
+       $(OBJS)\monodll_stdpaths.obj \
         $(OBJS)\monodll_thread.obj \
         $(OBJS)\monodll_utils.obj \
         $(OBJS)\monodll_utilsexc.obj \
@@ -273,26 +286,28 @@ MONODLL_OBJECTS =  \
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj \
         $(OBJS)\monodll_xtixml.obj
-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_75) /DWIN32 \
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_74_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
+       $(____DEBUGRUNTIME_87_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_75) /DWIN32 \
+MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_74_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
+       $(____DEBUGRUNTIME_87_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
  MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dummy.obj \
         $(OBJS)\monolib_appbase.obj \
+       $(OBJS)\monolib_archive.obj \
+       $(OBJS)\monolib_clntdata.obj \
         $(OBJS)\monolib_cmdline.obj \
         $(OBJS)\monolib_config.obj \
         $(OBJS)\monolib_datetime.obj \
@@ -311,7 +326,6 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_filesys.obj \
         $(OBJS)\monolib_fmapbase.obj \
         $(OBJS)\monolib_fs_zip.obj \
-       $(OBJS)\monolib_gzstream.obj \
         $(OBJS)\monolib_hash.obj \
         $(OBJS)\monolib_hashmap.obj \
         $(OBJS)\monolib_init.obj \
@@ -327,6 +341,8 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_object.obj \
         $(OBJS)\monolib_process.obj \
         $(OBJS)\monolib_regex.obj \
+       $(OBJS)\monolib_stdpbase.obj \
+       $(OBJS)\monolib_sstream.obj \
         $(OBJS)\monolib_stopwatch.obj \
         $(OBJS)\monolib_strconv.obj \
         $(OBJS)\monolib_stream.obj \
@@ -336,7 +352,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_textfile.obj \
         $(OBJS)\monolib_tokenzr.obj \
         $(OBJS)\monolib_txtstrm.obj \
-       $(OBJS)\monolib_unzip.obj \
+       $(OBJS)\monolib_uri.obj \
         $(OBJS)\monolib_variant.obj \
         $(OBJS)\monolib_wfstream.obj \
         $(OBJS)\monolib_wxchar.obj \
@@ -346,12 +362,16 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_zstream.obj \
         $(OBJS)\monolib_basemsw.obj \
         $(OBJS)\monolib_crashrpt.obj \
+       $(OBJS)\monolib_debughlp.obj \
         $(OBJS)\monolib_dde.obj \
         $(OBJS)\monolib_dir.obj \
+       $(OBJS)\monolib_dlmsw.obj \
         $(OBJS)\monolib_mimetype.obj \
         $(OBJS)\monolib_regconf.obj \
         $(OBJS)\monolib_registry.obj \
         $(OBJS)\monolib_snglinst.obj \
+       $(OBJS)\monolib_stackwalk.obj \
+       $(OBJS)\monolib_stdpaths.obj \
         $(OBJS)\monolib_thread.obj \
         $(OBJS)\monolib_utils.obj \
         $(OBJS)\monolib_utilsexc.obj \
@@ -377,27 +397,29 @@ MONOLIB_OBJECTS =  \
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj \
         $(OBJS)\monolib_xtixml.obj
-BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
+BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_100_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
+BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_100_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" \
+       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" \
         $(CPPFLAGS) $(CXXFLAGS)
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
         $(OBJS)\basedll_appbase.obj \
+       $(OBJS)\basedll_archive.obj \
+       $(OBJS)\basedll_clntdata.obj \
         $(OBJS)\basedll_cmdline.obj \
         $(OBJS)\basedll_config.obj \
         $(OBJS)\basedll_datetime.obj \
@@ -416,7 +438,6 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_filesys.obj \
         $(OBJS)\basedll_fmapbase.obj \
         $(OBJS)\basedll_fs_zip.obj \
-       $(OBJS)\basedll_gzstream.obj \
         $(OBJS)\basedll_hash.obj \
         $(OBJS)\basedll_hashmap.obj \
         $(OBJS)\basedll_init.obj \
@@ -432,6 +453,8 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_object.obj \
         $(OBJS)\basedll_process.obj \
         $(OBJS)\basedll_regex.obj \
+       $(OBJS)\basedll_stdpbase.obj \
+       $(OBJS)\basedll_sstream.obj \
         $(OBJS)\basedll_stopwatch.obj \
         $(OBJS)\basedll_strconv.obj \
         $(OBJS)\basedll_stream.obj \
@@ -441,7 +464,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_textfile.obj \
         $(OBJS)\basedll_tokenzr.obj \
         $(OBJS)\basedll_txtstrm.obj \
-       $(OBJS)\basedll_unzip.obj \
+       $(OBJS)\basedll_uri.obj \
         $(OBJS)\basedll_variant.obj \
         $(OBJS)\basedll_wfstream.obj \
         $(OBJS)\basedll_wxchar.obj \
@@ -451,12 +474,16 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_zstream.obj \
         $(OBJS)\basedll_basemsw.obj \
         $(OBJS)\basedll_crashrpt.obj \
+       $(OBJS)\basedll_debughlp.obj \
         $(OBJS)\basedll_dde.obj \
         $(OBJS)\basedll_dir.obj \
+       $(OBJS)\basedll_dlmsw.obj \
         $(OBJS)\basedll_mimetype.obj \
         $(OBJS)\basedll_regconf.obj \
         $(OBJS)\basedll_registry.obj \
         $(OBJS)\basedll_snglinst.obj \
+       $(OBJS)\basedll_stackwalk.obj \
+       $(OBJS)\basedll_stdpaths.obj \
         $(OBJS)\basedll_thread.obj \
         $(OBJS)\basedll_utils.obj \
         $(OBJS)\basedll_utilsexc.obj \
@@ -467,26 +494,28 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_main.obj \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_99) /DWIN32 \
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_98_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
+       $(____DEBUGRUNTIME_112_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_99) /DWIN32 \
+BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_98_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
+       $(____DEBUGRUNTIME_112_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \
+       /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
         $(OBJS)\baselib_appbase.obj \
+       $(OBJS)\baselib_archive.obj \
+       $(OBJS)\baselib_clntdata.obj \
         $(OBJS)\baselib_cmdline.obj \
         $(OBJS)\baselib_config.obj \
         $(OBJS)\baselib_datetime.obj \
@@ -505,7 +534,6 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_filesys.obj \
         $(OBJS)\baselib_fmapbase.obj \
         $(OBJS)\baselib_fs_zip.obj \
-       $(OBJS)\baselib_gzstream.obj \
         $(OBJS)\baselib_hash.obj \
         $(OBJS)\baselib_hashmap.obj \
         $(OBJS)\baselib_init.obj \
@@ -521,6 +549,8 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_object.obj \
         $(OBJS)\baselib_process.obj \
         $(OBJS)\baselib_regex.obj \
+       $(OBJS)\baselib_stdpbase.obj \
+       $(OBJS)\baselib_sstream.obj \
         $(OBJS)\baselib_stopwatch.obj \
         $(OBJS)\baselib_strconv.obj \
         $(OBJS)\baselib_stream.obj \
@@ -530,7 +560,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_textfile.obj \
         $(OBJS)\baselib_tokenzr.obj \
         $(OBJS)\baselib_txtstrm.obj \
-       $(OBJS)\baselib_unzip.obj \
+       $(OBJS)\baselib_uri.obj \
         $(OBJS)\baselib_variant.obj \
         $(OBJS)\baselib_wfstream.obj \
         $(OBJS)\baselib_wxchar.obj \
@@ -540,12 +570,16 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_zstream.obj \
         $(OBJS)\baselib_basemsw.obj \
         $(OBJS)\baselib_crashrpt.obj \
+       $(OBJS)\baselib_debughlp.obj \
         $(OBJS)\baselib_dde.obj \
         $(OBJS)\baselib_dir.obj \
+       $(OBJS)\baselib_dlmsw.obj \
         $(OBJS)\baselib_mimetype.obj \
         $(OBJS)\baselib_regconf.obj \
         $(OBJS)\baselib_registry.obj \
         $(OBJS)\baselib_snglinst.obj \
+       $(OBJS)\baselib_stackwalk.obj \
+       $(OBJS)\baselib_stdpaths.obj \
         $(OBJS)\baselib_thread.obj \
         $(OBJS)\baselib_utils.obj \
         $(OBJS)\baselib_utilsexc.obj \
@@ -556,23 +590,15 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
-NETDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_111) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_110_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET $(CPPFLAGS) $(CFLAGS)
-NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_111) /DWIN32 \
+NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_110_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_125_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" \
+       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" \
         $(CPPFLAGS) $(CXXFLAGS)
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
@@ -588,22 +614,14 @@ NETDLL_OBJECTS =  \
         $(OBJS)\netdll_url.obj \
         $(OBJS)\netdll_gsocket.obj \
         $(OBJS)\netdll_urlmsw.obj
-NETLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
-       $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS)
-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
-       $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
+       $(____DEBUGRUNTIME_137_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  NETLIB_OBJECTS =  \
         $(OBJS)\netlib_dummy.obj \
@@ -619,23 +637,15 @@ NETLIB_OBJECTS =  \
         $(OBJS)\netlib_url.obj \
         $(OBJS)\netlib_gsocket.obj \
         $(OBJS)\netlib_urlmsw.obj
-COREDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_135) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_134_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
-COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_135) /DWIN32 \
+COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_134_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_150_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" \
+       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" \
         $(CPPFLAGS) $(CXXFLAGS)
  COREDLL_OBJECTS =  \
         $(OBJS)\coredll_dummy.obj \
@@ -647,22 +657,14 @@ COREDLL_OBJECTS =  \
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
-CORELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_147) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
-       $(____DEBUGRUNTIME_146_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
-       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_147) /DWIN32 \
+CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
-       $(____DEBUGRUNTIME_146_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
+       $(____DEBUGRUNTIME_162_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       /DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)
  CORELIB_OBJECTS =  \
         $(OBJS)\corelib_dummy.obj \
@@ -674,115 +676,115 @@ CORELIB_OBJECTS =  \
         $(OBJS)\corelib_mslu.obj \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
-ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) /DWIN32 \
+ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_176) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_158_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_175_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \
+       /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  ADVDLL_OBJECTS =  \
         $(OBJS)\advdll_dummy.obj \
-       $(OBJS)\advdll_calctrl.obj \
-       $(OBJS)\advdll_grid.obj \
-       $(OBJS)\advdll_gridctrl.obj \
-       $(OBJS)\advdll_gridsel.obj \
-       $(OBJS)\advdll_helpext.obj \
-       $(OBJS)\advdll_laywin.obj \
-       $(OBJS)\advdll_sashwin.obj \
-       $(OBJS)\advdll_splash.obj \
-       $(OBJS)\advdll_tipdlg.obj \
-       $(OBJS)\advdll_wizard.obj \
-       $(OBJS)\advdll_taskbarcmn.obj \
-       $(OBJS)\advdll_joystick.obj \
-       $(OBJS)\advdll_sound.obj \
-       $(OBJS)\advdll_taskbar.obj
-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_171) /DWIN32 \
+       $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_188) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.pdb \
-       $(____DEBUGRUNTIME_170_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
+       $(____DEBUGRUNTIME_187_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  ADVLIB_OBJECTS =  \
         $(OBJS)\advlib_dummy.obj \
-       $(OBJS)\advlib_calctrl.obj \
-       $(OBJS)\advlib_grid.obj \
-       $(OBJS)\advlib_gridctrl.obj \
-       $(OBJS)\advlib_gridsel.obj \
-       $(OBJS)\advlib_helpext.obj \
-       $(OBJS)\advlib_laywin.obj \
-       $(OBJS)\advlib_sashwin.obj \
-       $(OBJS)\advlib_splash.obj \
-       $(OBJS)\advlib_tipdlg.obj \
-       $(OBJS)\advlib_wizard.obj \
-       $(OBJS)\advlib_taskbarcmn.obj \
-       $(OBJS)\advlib_joystick.obj \
-       $(OBJS)\advlib_sound.obj \
-       $(OBJS)\advlib_taskbar.obj
-ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_183) /DWIN32 \
+       $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
+MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_201) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_200_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+       /DWXUSINGDLL /DWXMAKINGDLL_MEDIA $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
+MEDIADLL_OBJECTS =  \
+       $(OBJS)\mediadll_dummy.obj \
+       $(OBJS)\mediadll_mediactrlcmn.obj \
+       $(OBJS)\mediadll_mediactrl.obj
+MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_213) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_182_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
+       $(____DEBUGRUNTIME_212_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)
+MEDIALIB_OBJECTS =  \
+       $(OBJS)\medialib_dummy.obj \
+       $(OBJS)\medialib_mediactrlcmn.obj \
+       $(OBJS)\medialib_mediactrl.obj
+ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_226) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_225_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch" \
+       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch" \
         $(CPPFLAGS) $(CXXFLAGS)
  ODBCDLL_OBJECTS =  \
         $(OBJS)\odbcdll_dummy.obj \
         $(OBJS)\odbcdll_db.obj \
         $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \
+ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_238) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.pdb \
-       $(____DEBUGRUNTIME_194_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \
+       $(____DEBUGRUNTIME_237_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /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)$(__DEBUGRUNTIME_207) /DWIN32 \
+DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_251) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_206_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_250_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \
+       /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
  DBGRIDDLL_OBJECTS =  \
         $(OBJS)\dbgriddll_dummy.obj \
         $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_219) /DWIN32 \
+DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_263) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.pdb \
-       $(____DEBUGRUNTIME_218_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.pdb \
+       $(____DEBUGRUNTIME_262_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /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)$(__DEBUGRUNTIME_231) /DWIN32 \
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_276) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_230_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_275_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \
+       /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_dummy.obj \
@@ -808,14 +810,14 @@ HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_m_tables.obj \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_243) /DWIN32 \
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_288) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \
-       $(____DEBUGRUNTIME_242_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
+       $(____DEBUGRUNTIME_287_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_dummy.obj \
@@ -841,53 +843,155 @@ HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
-XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_255) /DWIN32 \
+XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_301) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_254_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_300_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" \
+       $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" \
         $(CPPFLAGS) $(CXXFLAGS)
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
         $(OBJS)\xmldll_xml.obj \
         $(OBJS)\xmldll_xtixml.obj
-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_267) /DWIN32 \
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_313) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \
-       $(____DEBUGRUNTIME_266_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
+       $(____DEBUGRUNTIME_312_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /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
-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_279) /DWIN32 \
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_326) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_325_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+       /DWXUSINGDLL /DWXMAKINGDLL_XRC $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+XRCDLL_OBJECTS =  \
+       $(OBJS)\xrcdll_dummy.obj \
+       $(OBJS)\xrcdll_xh_bmpbt.obj \
+       $(OBJS)\xrcdll_xh_bmp.obj \
+       $(OBJS)\xrcdll_xh_bttn.obj \
+       $(OBJS)\xrcdll_xh_cald.obj \
+       $(OBJS)\xrcdll_xh_chckb.obj \
+       $(OBJS)\xrcdll_xh_chckl.obj \
+       $(OBJS)\xrcdll_xh_choic.obj \
+       $(OBJS)\xrcdll_xh_combo.obj \
+       $(OBJS)\xrcdll_xh_datectrl.obj \
+       $(OBJS)\xrcdll_xh_dlg.obj \
+       $(OBJS)\xrcdll_xh_frame.obj \
+       $(OBJS)\xrcdll_xh_gauge.obj \
+       $(OBJS)\xrcdll_xh_gdctl.obj \
+       $(OBJS)\xrcdll_xh_html.obj \
+       $(OBJS)\xrcdll_xh_listb.obj \
+       $(OBJS)\xrcdll_xh_listc.obj \
+       $(OBJS)\xrcdll_xh_menu.obj \
+       $(OBJS)\xrcdll_xh_notbk.obj \
+       $(OBJS)\xrcdll_xh_panel.obj \
+       $(OBJS)\xrcdll_xh_radbt.obj \
+       $(OBJS)\xrcdll_xh_radbx.obj \
+       $(OBJS)\xrcdll_xh_scrol.obj \
+       $(OBJS)\xrcdll_xh_scwin.obj \
+       $(OBJS)\xrcdll_xh_sizer.obj \
+       $(OBJS)\xrcdll_xh_slidr.obj \
+       $(OBJS)\xrcdll_xh_spin.obj \
+       $(OBJS)\xrcdll_xh_split.obj \
+       $(OBJS)\xrcdll_xh_statbar.obj \
+       $(OBJS)\xrcdll_xh_stbmp.obj \
+       $(OBJS)\xrcdll_xh_stbox.obj \
+       $(OBJS)\xrcdll_xh_stlin.obj \
+       $(OBJS)\xrcdll_xh_sttxt.obj \
+       $(OBJS)\xrcdll_xh_text.obj \
+       $(OBJS)\xrcdll_xh_tglbtn.obj \
+       $(OBJS)\xrcdll_xh_toolb.obj \
+       $(OBJS)\xrcdll_xh_tree.obj \
+       $(OBJS)\xrcdll_xh_unkwn.obj \
+       $(OBJS)\xrcdll_xh_wizrd.obj \
+       $(OBJS)\xrcdll_xmlres.obj \
+       $(OBJS)\xrcdll_xmlrsall.obj
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_338) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_278_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
+       $(____DEBUGRUNTIME_337_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
+XRCLIB_OBJECTS =  \
+       $(OBJS)\xrclib_dummy.obj \
+       $(OBJS)\xrclib_xh_bmpbt.obj \
+       $(OBJS)\xrclib_xh_bmp.obj \
+       $(OBJS)\xrclib_xh_bttn.obj \
+       $(OBJS)\xrclib_xh_cald.obj \
+       $(OBJS)\xrclib_xh_chckb.obj \
+       $(OBJS)\xrclib_xh_chckl.obj \
+       $(OBJS)\xrclib_xh_choic.obj \
+       $(OBJS)\xrclib_xh_combo.obj \
+       $(OBJS)\xrclib_xh_datectrl.obj \
+       $(OBJS)\xrclib_xh_dlg.obj \
+       $(OBJS)\xrclib_xh_frame.obj \
+       $(OBJS)\xrclib_xh_gauge.obj \
+       $(OBJS)\xrclib_xh_gdctl.obj \
+       $(OBJS)\xrclib_xh_html.obj \
+       $(OBJS)\xrclib_xh_listb.obj \
+       $(OBJS)\xrclib_xh_listc.obj \
+       $(OBJS)\xrclib_xh_menu.obj \
+       $(OBJS)\xrclib_xh_notbk.obj \
+       $(OBJS)\xrclib_xh_panel.obj \
+       $(OBJS)\xrclib_xh_radbt.obj \
+       $(OBJS)\xrclib_xh_radbx.obj \
+       $(OBJS)\xrclib_xh_scrol.obj \
+       $(OBJS)\xrclib_xh_scwin.obj \
+       $(OBJS)\xrclib_xh_sizer.obj \
+       $(OBJS)\xrclib_xh_slidr.obj \
+       $(OBJS)\xrclib_xh_spin.obj \
+       $(OBJS)\xrclib_xh_split.obj \
+       $(OBJS)\xrclib_xh_statbar.obj \
+       $(OBJS)\xrclib_xh_stbmp.obj \
+       $(OBJS)\xrclib_xh_stbox.obj \
+       $(OBJS)\xrclib_xh_stlin.obj \
+       $(OBJS)\xrclib_xh_sttxt.obj \
+       $(OBJS)\xrclib_xh_text.obj \
+       $(OBJS)\xrclib_xh_tglbtn.obj \
+       $(OBJS)\xrclib_xh_toolb.obj \
+       $(OBJS)\xrclib_xh_tree.obj \
+       $(OBJS)\xrclib_xh_unkwn.obj \
+       $(OBJS)\xrclib_xh_wizrd.obj \
+       $(OBJS)\xrclib_xmlres.obj \
+       $(OBJS)\xrclib_xmlrsall.obj
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_351) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_350_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
+       /DWXUSINGDLL /DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  GLDLL_OBJECTS =  \
         $(OBJS)\gldll_dummy.obj \
         $(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_291) /DWIN32 \
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_363) /DWIN32 \
         $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \
-       $(____DEBUGRUNTIME_290_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
+       $(____DEBUGRUNTIME_362_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
         /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  GLLIB_OBJECTS =  \
         $(OBJS)\gllib_dummy.obj \
@@ -923,6 +1027,12 @@ WXUNIVNAME = univ
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
  ____DEBUGRUNTIME_2_p = 
  !endif
@@ -939,152 +1049,141 @@ __DEBUGRUNTIME_3 =
  __DEBUGRUNTIME_3 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_3 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_12_p = 
+____DEBUGRUNTIME_14_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_12_p = /D_DEBUG
+____DEBUGRUNTIME_14_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_12_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_14_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_13 = 
+__DEBUGRUNTIME_15 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_13 = d
+__DEBUGRUNTIME_15 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_13 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_15 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_22_p = 
+____DEBUGRUNTIME_26_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_22_p = /D_DEBUG
+____DEBUGRUNTIME_26_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_22_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_26_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_23 = 
+__DEBUGRUNTIME_27 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_23 = d
+__DEBUGRUNTIME_27 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_23 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_27 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_32_p = 
+____DEBUGRUNTIME_38_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_32_p = /D_DEBUG
+____DEBUGRUNTIME_38_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_32_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_38_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_33 = 
+__DEBUGRUNTIME_39 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_33 = d
+__DEBUGRUNTIME_39 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_33 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_39 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_42_p = 
+____DEBUGRUNTIME_50_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_42_p = /D_DEBUG
+____DEBUGRUNTIME_50_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_42_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_50_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_43 = 
+__DEBUGRUNTIME_51 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_43 = d
+__DEBUGRUNTIME_51 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_43 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_51 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_52_p = 
+____DEBUGRUNTIME_62_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_52_p = /D_DEBUG
+____DEBUGRUNTIME_62_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_52_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_62_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_53 = 
+__DEBUGRUNTIME_63 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_53 = d
+__DEBUGRUNTIME_63 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_53 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_63 = $(__DEBUGINFO_3_0)
  !endif
-!if "$(SHARED)" == "0"
-____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_lib$(CFG)
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
  !endif
-!if "$(SHARED)" == "1"
-____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_dll$(CFG)
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
  !endif
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
  __monodll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_62_p = 
+____DEBUGRUNTIME_75_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_62_p = /D_DEBUG
+____DEBUGRUNTIME_75_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_62_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_75_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_63 = 
+__DEBUGRUNTIME_76 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_63 = d
+__DEBUGRUNTIME_76 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_63 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_76 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_OBJECTS) \
-       $(OBJS)\monodll_calctrl.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_tipdlg.obj \
-       $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_taskbarcmn.obj \
-       $(OBJS)\monodll_joystick.obj \
-       $(OBJS)\monodll_sound.obj \
-       $(OBJS)\monodll_taskbar.obj \
+       $(____ADVANCED_SRC_FILENAMES_OBJECTS) \
+       $(OBJS)\monodll_mediactrlcmn.obj \
+       $(OBJS)\monodll_mediactrl.obj \
         $(OBJS)\monodll_helpbest.obj \
         $(OBJS)\monodll_helpctrl.obj \
         $(OBJS)\monodll_helpdata.obj \
@@ -1109,7 +1208,47 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_htmllbox.obj \
         $(OBJS)\monodll_db.obj \
         $(OBJS)\monodll_dbtable.obj \
-       $(OBJS)\monodll_dbgrid.obj
+       $(OBJS)\monodll_dbgrid.obj \
+       $(OBJS)\monodll_xh_bmpbt.obj \
+       $(OBJS)\monodll_xh_bmp.obj \
+       $(OBJS)\monodll_xh_bttn.obj \
+       $(OBJS)\monodll_xh_cald.obj \
+       $(OBJS)\monodll_xh_chckb.obj \
+       $(OBJS)\monodll_xh_chckl.obj \
+       $(OBJS)\monodll_xh_choic.obj \
+       $(OBJS)\monodll_xh_combo.obj \
+       $(OBJS)\monodll_xh_datectrl.obj \
+       $(OBJS)\monodll_xh_dlg.obj \
+       $(OBJS)\monodll_xh_frame.obj \
+       $(OBJS)\monodll_xh_gauge.obj \
+       $(OBJS)\monodll_xh_gdctl.obj \
+       $(OBJS)\monodll_xh_html.obj \
+       $(OBJS)\monodll_xh_listb.obj \
+       $(OBJS)\monodll_xh_listc.obj \
+       $(OBJS)\monodll_xh_menu.obj \
+       $(OBJS)\monodll_xh_notbk.obj \
+       $(OBJS)\monodll_xh_panel.obj \
+       $(OBJS)\monodll_xh_radbt.obj \
+       $(OBJS)\monodll_xh_radbx.obj \
+       $(OBJS)\monodll_xh_scrol.obj \
+       $(OBJS)\monodll_xh_scwin.obj \
+       $(OBJS)\monodll_xh_sizer.obj \
+       $(OBJS)\monodll_xh_slidr.obj \
+       $(OBJS)\monodll_xh_spin.obj \
+       $(OBJS)\monodll_xh_split.obj \
+       $(OBJS)\monodll_xh_statbar.obj \
+       $(OBJS)\monodll_xh_stbmp.obj \
+       $(OBJS)\monodll_xh_stbox.obj \
+       $(OBJS)\monodll_xh_stlin.obj \
+       $(OBJS)\monodll_xh_sttxt.obj \
+       $(OBJS)\monodll_xh_text.obj \
+       $(OBJS)\monodll_xh_tglbtn.obj \
+       $(OBJS)\monodll_xh_toolb.obj \
+       $(OBJS)\monodll_xh_tree.obj \
+       $(OBJS)\monodll_xh_unkwn.obj \
+       $(OBJS)\monodll_xh_wizrd.obj \
+       $(OBJS)\monodll_xmlres.obj \
+       $(OBJS)\monodll_xmlrsall.obj
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -1128,7 +1267,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dcscreen.obj \
         $(OBJS)\monodll_dialup.obj \
         $(OBJS)\monodll_dib.obj \
-       $(OBJS)\monodll_dirdlg.obj \
         $(OBJS)\monodll_display.obj \
         $(OBJS)\monodll_enhmeta.obj \
         $(OBJS)\monodll_evtloop.obj \
@@ -1138,16 +1276,12 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
         $(OBJS)\monodll_gsockmsw.obj \
-       $(OBJS)\monodll_helpchm.obj \
-       $(OBJS)\monodll_helpwin.obj \
         $(OBJS)\monodll_icon.obj \
         $(OBJS)\monodll_minifram.obj \
-       $(OBJS)\monodll_automtn.obj \
         $(OBJS)\monodll_dataobj.obj \
         $(OBJS)\monodll_dropsrc.obj \
         $(OBJS)\monodll_droptgt.obj \
         $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_uuid.obj \
         $(OBJS)\monodll_palette.obj \
         $(OBJS)\monodll_pen.obj \
         $(OBJS)\monodll_popupwin.obj \
@@ -1162,6 +1296,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_utilsgui.obj \
         $(OBJS)\monodll_uxtheme.obj \
         $(OBJS)\monodll_window.obj \
+       $(OBJS)\monodll_helpchm.obj \
+       $(OBJS)\monodll_helpwin.obj \
+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_uuid.obj \
         $(OBJS)\monodll_statusbr.obj \
         $(OBJS)\monodll_prntdlgg.obj \
         $(OBJS)\monodll_accel.obj \
@@ -1174,10 +1312,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_combobox.obj \
         $(OBJS)\monodll_control.obj \
         $(OBJS)\monodll_dialog.obj \
+       $(OBJS)\monodll_dirdlg.obj \
         $(OBJS)\monodll_dragimag.obj \
-       $(OBJS)\monodll_fdrepdlg.obj \
         $(OBJS)\monodll_filedlg.obj \
-       $(OBJS)\monodll_fontdlg.obj \
         $(OBJS)\monodll_frame.obj \
         $(OBJS)\monodll_gauge95.obj \
         $(OBJS)\monodll_imaglist.obj \
@@ -1209,6 +1346,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_tglbtn.obj \
         $(OBJS)\monodll_treectrl.obj \
+       $(OBJS)\monodll_fdrepdlg.obj \
+       $(OBJS)\monodll_fontdlg.obj \
         $(OBJS)\monodll_accesscmn.obj \
         $(OBJS)\monodll_appcmn.obj \
         $(OBJS)\monodll_artprov.obj \
@@ -1217,7 +1356,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_bookctrl.obj \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
-       $(OBJS)\monodll_clntdata.obj \
         $(OBJS)\monodll_cmdproc.obj \
         $(OBJS)\monodll_cmndata.obj \
         $(OBJS)\monodll_containr.obj \
@@ -1273,6 +1411,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
         $(OBJS)\monodll_statbar.obj \
+       $(OBJS)\monodll_stockitem.obj \
         $(OBJS)\monodll_tbarbase.obj \
         $(OBJS)\monodll_textcmn.obj \
         $(OBJS)\monodll_timercmn.obj \
@@ -1285,6 +1424,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
         $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_choicbkg.obj \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
@@ -1322,7 +1462,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dcscreen.obj \
         $(OBJS)\monodll_dialup.obj \
         $(OBJS)\monodll_dib.obj \
-       $(OBJS)\monodll_dirdlg.obj \
         $(OBJS)\monodll_display.obj \
         $(OBJS)\monodll_enhmeta.obj \
         $(OBJS)\monodll_evtloop.obj \
@@ -1332,16 +1471,12 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
         $(OBJS)\monodll_gsockmsw.obj \
-       $(OBJS)\monodll_helpchm.obj \
-       $(OBJS)\monodll_helpwin.obj \
         $(OBJS)\monodll_icon.obj \
         $(OBJS)\monodll_minifram.obj \
-       $(OBJS)\monodll_automtn.obj \
         $(OBJS)\monodll_dataobj.obj \
         $(OBJS)\monodll_dropsrc.obj \
         $(OBJS)\monodll_droptgt.obj \
         $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_uuid.obj \
         $(OBJS)\monodll_palette.obj \
         $(OBJS)\monodll_pen.obj \
         $(OBJS)\monodll_popupwin.obj \
@@ -1356,6 +1491,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_utilsgui.obj \
         $(OBJS)\monodll_uxtheme.obj \
         $(OBJS)\monodll_window.obj \
+       $(OBJS)\monodll_helpchm.obj \
+       $(OBJS)\monodll_helpwin.obj \
+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_uuid.obj \
         $(OBJS)\monodll_accel.obj \
         $(OBJS)\monodll_colrdlgg.obj \
         $(OBJS)\monodll_dirdlgg.obj \
@@ -1413,7 +1552,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_bookctrl.obj \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
-       $(OBJS)\monodll_clntdata.obj \
         $(OBJS)\monodll_cmdproc.obj \
         $(OBJS)\monodll_cmndata.obj \
         $(OBJS)\monodll_containr.obj \
@@ -1469,6 +1607,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
         $(OBJS)\monodll_statbar.obj \
+       $(OBJS)\monodll_stockitem.obj \
         $(OBJS)\monodll_tbarbase.obj \
         $(OBJS)\monodll_textcmn.obj \
         $(OBJS)\monodll_timercmn.obj \
@@ -1481,6 +1620,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
         $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_choicbkg.obj \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
@@ -1501,45 +1641,71 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datectlg.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_wizard.obj \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_sound.obj \
+       $(OBJS)\monodll_taskbar.obj \
+       $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datectlg.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_wizard.obj \
+       $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_sound.obj \
+       $(OBJS)\monodll_taskbar.obj \
+       $(OBJS)\monodll_joystick.obj
+!endif
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
  __monolib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_74_p = 
+____DEBUGRUNTIME_87_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_74_p = /D_DEBUG
+____DEBUGRUNTIME_87_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_74_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_87_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_75 = 
+__DEBUGRUNTIME_88 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_75 = d
+__DEBUGRUNTIME_88 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_75 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_88 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_1_OBJECTS) \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_grid.obj \
-       $(OBJS)\monolib_gridctrl.obj \
-       $(OBJS)\monolib_gridsel.obj \
-       $(OBJS)\monolib_helpext.obj \
-       $(OBJS)\monolib_laywin.obj \
-       $(OBJS)\monolib_sashwin.obj \
-       $(OBJS)\monolib_splash.obj \
-       $(OBJS)\monolib_tipdlg.obj \
-       $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_taskbarcmn.obj \
-       $(OBJS)\monolib_joystick.obj \
-       $(OBJS)\monolib_sound.obj \
-       $(OBJS)\monolib_taskbar.obj \
+       $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
+       $(OBJS)\monolib_mediactrlcmn.obj \
+       $(OBJS)\monolib_mediactrl.obj \
         $(OBJS)\monolib_helpbest.obj \
         $(OBJS)\monolib_helpctrl.obj \
         $(OBJS)\monolib_helpdata.obj \
@@ -1564,7 +1730,47 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_htmllbox.obj \
         $(OBJS)\monolib_db.obj \
         $(OBJS)\monolib_dbtable.obj \
-       $(OBJS)\monolib_dbgrid.obj
+       $(OBJS)\monolib_dbgrid.obj \
+       $(OBJS)\monolib_xh_bmpbt.obj \
+       $(OBJS)\monolib_xh_bmp.obj \
+       $(OBJS)\monolib_xh_bttn.obj \
+       $(OBJS)\monolib_xh_cald.obj \
+       $(OBJS)\monolib_xh_chckb.obj \
+       $(OBJS)\monolib_xh_chckl.obj \
+       $(OBJS)\monolib_xh_choic.obj \
+       $(OBJS)\monolib_xh_combo.obj \
+       $(OBJS)\monolib_xh_datectrl.obj \
+       $(OBJS)\monolib_xh_dlg.obj \
+       $(OBJS)\monolib_xh_frame.obj \
+       $(OBJS)\monolib_xh_gauge.obj \
+       $(OBJS)\monolib_xh_gdctl.obj \
+       $(OBJS)\monolib_xh_html.obj \
+       $(OBJS)\monolib_xh_listb.obj \
+       $(OBJS)\monolib_xh_listc.obj \
+       $(OBJS)\monolib_xh_menu.obj \
+       $(OBJS)\monolib_xh_notbk.obj \
+       $(OBJS)\monolib_xh_panel.obj \
+       $(OBJS)\monolib_xh_radbt.obj \
+       $(OBJS)\monolib_xh_radbx.obj \
+       $(OBJS)\monolib_xh_scrol.obj \
+       $(OBJS)\monolib_xh_scwin.obj \
+       $(OBJS)\monolib_xh_sizer.obj \
+       $(OBJS)\monolib_xh_slidr.obj \
+       $(OBJS)\monolib_xh_spin.obj \
+       $(OBJS)\monolib_xh_split.obj \
+       $(OBJS)\monolib_xh_statbar.obj \
+       $(OBJS)\monolib_xh_stbmp.obj \
+       $(OBJS)\monolib_xh_stbox.obj \
+       $(OBJS)\monolib_xh_stlin.obj \
+       $(OBJS)\monolib_xh_sttxt.obj \
+       $(OBJS)\monolib_xh_text.obj \
+       $(OBJS)\monolib_xh_tglbtn.obj \
+       $(OBJS)\monolib_xh_toolb.obj \
+       $(OBJS)\monolib_xh_tree.obj \
+       $(OBJS)\monolib_xh_unkwn.obj \
+       $(OBJS)\monolib_xh_wizrd.obj \
+       $(OBJS)\monolib_xmlres.obj \
+       $(OBJS)\monolib_xmlrsall.obj
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -1583,7 +1789,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dcscreen.obj \
         $(OBJS)\monolib_dialup.obj \
         $(OBJS)\monolib_dib.obj \
-       $(OBJS)\monolib_dirdlg.obj \
         $(OBJS)\monolib_display.obj \
         $(OBJS)\monolib_enhmeta.obj \
         $(OBJS)\monolib_evtloop.obj \
@@ -1593,16 +1798,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
         $(OBJS)\monolib_gsockmsw.obj \
-       $(OBJS)\monolib_helpchm.obj \
-       $(OBJS)\monolib_helpwin.obj \
         $(OBJS)\monolib_icon.obj \
         $(OBJS)\monolib_minifram.obj \
-       $(OBJS)\monolib_automtn.obj \
         $(OBJS)\monolib_dataobj.obj \
         $(OBJS)\monolib_dropsrc.obj \
         $(OBJS)\monolib_droptgt.obj \
         $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_uuid.obj \
         $(OBJS)\monolib_palette.obj \
         $(OBJS)\monolib_pen.obj \
         $(OBJS)\monolib_popupwin.obj \
@@ -1617,6 +1818,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_utilsgui.obj \
         $(OBJS)\monolib_uxtheme.obj \
         $(OBJS)\monolib_window.obj \
+       $(OBJS)\monolib_helpchm.obj \
+       $(OBJS)\monolib_helpwin.obj \
+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_uuid.obj \
         $(OBJS)\monolib_statusbr.obj \
         $(OBJS)\monolib_prntdlgg.obj \
         $(OBJS)\monolib_accel.obj \
@@ -1629,10 +1834,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_combobox.obj \
         $(OBJS)\monolib_control.obj \
         $(OBJS)\monolib_dialog.obj \
+       $(OBJS)\monolib_dirdlg.obj \
         $(OBJS)\monolib_dragimag.obj \
-       $(OBJS)\monolib_fdrepdlg.obj \
         $(OBJS)\monolib_filedlg.obj \
-       $(OBJS)\monolib_fontdlg.obj \
         $(OBJS)\monolib_frame.obj \
         $(OBJS)\monolib_gauge95.obj \
         $(OBJS)\monolib_imaglist.obj \
@@ -1664,6 +1868,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_tglbtn.obj \
         $(OBJS)\monolib_treectrl.obj \
+       $(OBJS)\monolib_fdrepdlg.obj \
+       $(OBJS)\monolib_fontdlg.obj \
         $(OBJS)\monolib_accesscmn.obj \
         $(OBJS)\monolib_appcmn.obj \
         $(OBJS)\monolib_artprov.obj \
@@ -1672,7 +1878,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_bookctrl.obj \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
-       $(OBJS)\monolib_clntdata.obj \
         $(OBJS)\monolib_cmdproc.obj \
         $(OBJS)\monolib_cmndata.obj \
         $(OBJS)\monolib_containr.obj \
@@ -1728,6 +1933,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
         $(OBJS)\monolib_statbar.obj \
+       $(OBJS)\monolib_stockitem.obj \
         $(OBJS)\monolib_tbarbase.obj \
         $(OBJS)\monolib_textcmn.obj \
         $(OBJS)\monolib_timercmn.obj \
@@ -1740,6 +1946,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
         $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_choicbkg.obj \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
@@ -1777,7 +1984,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dcscreen.obj \
         $(OBJS)\monolib_dialup.obj \
         $(OBJS)\monolib_dib.obj \
-       $(OBJS)\monolib_dirdlg.obj \
         $(OBJS)\monolib_display.obj \
         $(OBJS)\monolib_enhmeta.obj \
         $(OBJS)\monolib_evtloop.obj \
@@ -1787,16 +1993,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
         $(OBJS)\monolib_gsockmsw.obj \
-       $(OBJS)\monolib_helpchm.obj \
-       $(OBJS)\monolib_helpwin.obj \
         $(OBJS)\monolib_icon.obj \
         $(OBJS)\monolib_minifram.obj \
-       $(OBJS)\monolib_automtn.obj \
         $(OBJS)\monolib_dataobj.obj \
         $(OBJS)\monolib_dropsrc.obj \
         $(OBJS)\monolib_droptgt.obj \
         $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_uuid.obj \
         $(OBJS)\monolib_palette.obj \
         $(OBJS)\monolib_pen.obj \
         $(OBJS)\monolib_popupwin.obj \
@@ -1811,6 +2013,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_utilsgui.obj \
         $(OBJS)\monolib_uxtheme.obj \
         $(OBJS)\monolib_window.obj \
+       $(OBJS)\monolib_helpchm.obj \
+       $(OBJS)\monolib_helpwin.obj \
+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_uuid.obj \
         $(OBJS)\monolib_accel.obj \
         $(OBJS)\monolib_colrdlgg.obj \
         $(OBJS)\monolib_dirdlgg.obj \
@@ -1868,7 +2074,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_bookctrl.obj \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
-       $(OBJS)\monolib_clntdata.obj \
         $(OBJS)\monolib_cmdproc.obj \
         $(OBJS)\monolib_cmndata.obj \
         $(OBJS)\monolib_containr.obj \
@@ -1924,6 +2129,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
         $(OBJS)\monolib_statbar.obj \
+       $(OBJS)\monolib_stockitem.obj \
         $(OBJS)\monolib_tbarbase.obj \
         $(OBJS)\monolib_textcmn.obj \
         $(OBJS)\monolib_timercmn.obj \
@@ -1936,6 +2142,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
         $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_choicbkg.obj \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
@@ -1956,115 +2163,152 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datectlg.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_wizard.obj \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_sound.obj \
+       $(OBJS)\monolib_taskbar.obj \
+       $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datectlg.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_wizard.obj \
+       $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_sound.obj \
+       $(OBJS)\monolib_taskbar.obj \
+       $(OBJS)\monolib_joystick.obj
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __basedll___depname = \
-       $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_86_p = 
+____DEBUGRUNTIME_100_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_86_p = /D_DEBUG
+____DEBUGRUNTIME_100_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_86_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_100_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_87 = 
+__DEBUGRUNTIME_101 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_87 = d
+__DEBUGRUNTIME_101 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_87 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_101 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __baselib___depname = \
-       $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_98_p = 
+____DEBUGRUNTIME_112_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_98_p = /D_DEBUG
+____DEBUGRUNTIME_112_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_98_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_112_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_99 = 
+__DEBUGRUNTIME_113 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_99 = d
+__DEBUGRUNTIME_113 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_99 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_113 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __netdll___depname = \
-       $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_110_p = 
+____DEBUGRUNTIME_125_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_110_p = /D_DEBUG
+____DEBUGRUNTIME_125_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_110_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_125_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_111 = 
+__DEBUGRUNTIME_126 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_111 = d
+__DEBUGRUNTIME_126 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_111 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_126 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __netlib___depname = \
-       $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_122_p = 
+____DEBUGRUNTIME_137_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_122_p = /D_DEBUG
+____DEBUGRUNTIME_137_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_122_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_137_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_123 = 
+__DEBUGRUNTIME_138 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_123 = d
+__DEBUGRUNTIME_138 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_123 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_138 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __coredll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_134_p = 
+____DEBUGRUNTIME_150_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_134_p = /D_DEBUG
+____DEBUGRUNTIME_150_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_134_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_150_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_135 = 
+__DEBUGRUNTIME_151 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_135 = d
+__DEBUGRUNTIME_151 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_135 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_151 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_2_OBJECTS =  \
@@ -2083,7 +2327,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dcscreen.obj \
         $(OBJS)\coredll_dialup.obj \
         $(OBJS)\coredll_dib.obj \
-       $(OBJS)\coredll_dirdlg.obj \
         $(OBJS)\coredll_display.obj \
         $(OBJS)\coredll_enhmeta.obj \
         $(OBJS)\coredll_evtloop.obj \
@@ -2093,16 +2336,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
         $(OBJS)\coredll_gsockmsw.obj \
-       $(OBJS)\coredll_helpchm.obj \
-       $(OBJS)\coredll_helpwin.obj \
         $(OBJS)\coredll_icon.obj \
         $(OBJS)\coredll_minifram.obj \
-       $(OBJS)\coredll_automtn.obj \
         $(OBJS)\coredll_dataobj.obj \
         $(OBJS)\coredll_dropsrc.obj \
         $(OBJS)\coredll_droptgt.obj \
         $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_uuid.obj \
         $(OBJS)\coredll_palette.obj \
         $(OBJS)\coredll_pen.obj \
         $(OBJS)\coredll_popupwin.obj \
@@ -2117,6 +2356,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_utilsgui.obj \
         $(OBJS)\coredll_uxtheme.obj \
         $(OBJS)\coredll_window.obj \
+       $(OBJS)\coredll_helpchm.obj \
+       $(OBJS)\coredll_helpwin.obj \
+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_uuid.obj \
         $(OBJS)\coredll_statusbr.obj \
         $(OBJS)\coredll_prntdlgg.obj \
         $(OBJS)\coredll_accel.obj \
@@ -2129,10 +2372,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_combobox.obj \
         $(OBJS)\coredll_control.obj \
         $(OBJS)\coredll_dialog.obj \
+       $(OBJS)\coredll_dirdlg.obj \
         $(OBJS)\coredll_dragimag.obj \
-       $(OBJS)\coredll_fdrepdlg.obj \
         $(OBJS)\coredll_filedlg.obj \
-       $(OBJS)\coredll_fontdlg.obj \
         $(OBJS)\coredll_frame.obj \
         $(OBJS)\coredll_gauge95.obj \
         $(OBJS)\coredll_imaglist.obj \
@@ -2164,6 +2406,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_tglbtn.obj \
         $(OBJS)\coredll_treectrl.obj \
+       $(OBJS)\coredll_fdrepdlg.obj \
+       $(OBJS)\coredll_fontdlg.obj \
         $(OBJS)\coredll_accesscmn.obj \
         $(OBJS)\coredll_appcmn.obj \
         $(OBJS)\coredll_artprov.obj \
@@ -2172,7 +2416,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_bookctrl.obj \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
-       $(OBJS)\coredll_clntdata.obj \
         $(OBJS)\coredll_cmdproc.obj \
         $(OBJS)\coredll_cmndata.obj \
         $(OBJS)\coredll_containr.obj \
@@ -2228,6 +2471,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
         $(OBJS)\coredll_statbar.obj \
+       $(OBJS)\coredll_stockitem.obj \
         $(OBJS)\coredll_tbarbase.obj \
         $(OBJS)\coredll_textcmn.obj \
         $(OBJS)\coredll_timercmn.obj \
@@ -2240,6 +2484,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
         $(OBJS)\coredll_choicdgg.obj \
+       $(OBJS)\coredll_choicbkg.obj \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
@@ -2277,7 +2522,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dcscreen.obj \
         $(OBJS)\coredll_dialup.obj \
         $(OBJS)\coredll_dib.obj \
-       $(OBJS)\coredll_dirdlg.obj \
         $(OBJS)\coredll_display.obj \
         $(OBJS)\coredll_enhmeta.obj \
         $(OBJS)\coredll_evtloop.obj \
@@ -2287,16 +2531,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
         $(OBJS)\coredll_gsockmsw.obj \
-       $(OBJS)\coredll_helpchm.obj \
-       $(OBJS)\coredll_helpwin.obj \
         $(OBJS)\coredll_icon.obj \
         $(OBJS)\coredll_minifram.obj \
-       $(OBJS)\coredll_automtn.obj \
         $(OBJS)\coredll_dataobj.obj \
         $(OBJS)\coredll_dropsrc.obj \
         $(OBJS)\coredll_droptgt.obj \
         $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_uuid.obj \
         $(OBJS)\coredll_palette.obj \
         $(OBJS)\coredll_pen.obj \
         $(OBJS)\coredll_popupwin.obj \
@@ -2311,6 +2551,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_utilsgui.obj \
         $(OBJS)\coredll_uxtheme.obj \
         $(OBJS)\coredll_window.obj \
+       $(OBJS)\coredll_helpchm.obj \
+       $(OBJS)\coredll_helpwin.obj \
+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_uuid.obj \
         $(OBJS)\coredll_accel.obj \
         $(OBJS)\coredll_colrdlgg.obj \
         $(OBJS)\coredll_dirdlgg.obj \
@@ -2368,7 +2612,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_bookctrl.obj \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
-       $(OBJS)\coredll_clntdata.obj \
         $(OBJS)\coredll_cmdproc.obj \
         $(OBJS)\coredll_cmndata.obj \
         $(OBJS)\coredll_containr.obj \
@@ -2424,6 +2667,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
         $(OBJS)\coredll_statbar.obj \
+       $(OBJS)\coredll_stockitem.obj \
         $(OBJS)\coredll_tbarbase.obj \
         $(OBJS)\coredll_textcmn.obj \
         $(OBJS)\coredll_timercmn.obj \
@@ -2436,6 +2680,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
         $(OBJS)\coredll_choicdgg.obj \
+       $(OBJS)\coredll_choicbkg.obj \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
@@ -2458,25 +2703,25 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  __corelib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_146_p = 
+____DEBUGRUNTIME_162_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_146_p = /D_DEBUG
+____DEBUGRUNTIME_162_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_146_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_162_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_147 = 
+__DEBUGRUNTIME_163 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_147 = d
+__DEBUGRUNTIME_163 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_147 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_163 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_3_OBJECTS =  \
@@ -2495,7 +2740,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dcscreen.obj \
         $(OBJS)\corelib_dialup.obj \
         $(OBJS)\corelib_dib.obj \
-       $(OBJS)\corelib_dirdlg.obj \
         $(OBJS)\corelib_display.obj \
         $(OBJS)\corelib_enhmeta.obj \
         $(OBJS)\corelib_evtloop.obj \
@@ -2505,16 +2749,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
         $(OBJS)\corelib_gsockmsw.obj \
-       $(OBJS)\corelib_helpchm.obj \
-       $(OBJS)\corelib_helpwin.obj \
         $(OBJS)\corelib_icon.obj \
         $(OBJS)\corelib_minifram.obj \
-       $(OBJS)\corelib_automtn.obj \
         $(OBJS)\corelib_dataobj.obj \
         $(OBJS)\corelib_dropsrc.obj \
         $(OBJS)\corelib_droptgt.obj \
         $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_uuid.obj \
         $(OBJS)\corelib_palette.obj \
         $(OBJS)\corelib_pen.obj \
         $(OBJS)\corelib_popupwin.obj \
@@ -2529,6 +2769,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_utilsgui.obj \
         $(OBJS)\corelib_uxtheme.obj \
         $(OBJS)\corelib_window.obj \
+       $(OBJS)\corelib_helpchm.obj \
+       $(OBJS)\corelib_helpwin.obj \
+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_uuid.obj \
         $(OBJS)\corelib_statusbr.obj \
         $(OBJS)\corelib_prntdlgg.obj \
         $(OBJS)\corelib_accel.obj \
@@ -2541,10 +2785,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_combobox.obj \
         $(OBJS)\corelib_control.obj \
         $(OBJS)\corelib_dialog.obj \
+       $(OBJS)\corelib_dirdlg.obj \
         $(OBJS)\corelib_dragimag.obj \
-       $(OBJS)\corelib_fdrepdlg.obj \
         $(OBJS)\corelib_filedlg.obj \
-       $(OBJS)\corelib_fontdlg.obj \
         $(OBJS)\corelib_frame.obj \
         $(OBJS)\corelib_gauge95.obj \
         $(OBJS)\corelib_imaglist.obj \
@@ -2576,6 +2819,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_tglbtn.obj \
         $(OBJS)\corelib_treectrl.obj \
+       $(OBJS)\corelib_fdrepdlg.obj \
+       $(OBJS)\corelib_fontdlg.obj \
         $(OBJS)\corelib_accesscmn.obj \
         $(OBJS)\corelib_appcmn.obj \
         $(OBJS)\corelib_artprov.obj \
@@ -2584,7 +2829,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_bookctrl.obj \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
-       $(OBJS)\corelib_clntdata.obj \
         $(OBJS)\corelib_cmdproc.obj \
         $(OBJS)\corelib_cmndata.obj \
         $(OBJS)\corelib_containr.obj \
@@ -2640,6 +2884,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
         $(OBJS)\corelib_statbar.obj \
+       $(OBJS)\corelib_stockitem.obj \
         $(OBJS)\corelib_tbarbase.obj \
         $(OBJS)\corelib_textcmn.obj \
         $(OBJS)\corelib_timercmn.obj \
@@ -2652,6 +2897,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
         $(OBJS)\corelib_choicdgg.obj \
+       $(OBJS)\corelib_choicbkg.obj \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
@@ -2689,7 +2935,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dcscreen.obj \
         $(OBJS)\corelib_dialup.obj \
         $(OBJS)\corelib_dib.obj \
-       $(OBJS)\corelib_dirdlg.obj \
         $(OBJS)\corelib_display.obj \
         $(OBJS)\corelib_enhmeta.obj \
         $(OBJS)\corelib_evtloop.obj \
@@ -2699,16 +2944,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
         $(OBJS)\corelib_gsockmsw.obj \
-       $(OBJS)\corelib_helpchm.obj \
-       $(OBJS)\corelib_helpwin.obj \
         $(OBJS)\corelib_icon.obj \
         $(OBJS)\corelib_minifram.obj \
-       $(OBJS)\corelib_automtn.obj \
         $(OBJS)\corelib_dataobj.obj \
         $(OBJS)\corelib_dropsrc.obj \
         $(OBJS)\corelib_droptgt.obj \
         $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_uuid.obj \
         $(OBJS)\corelib_palette.obj \
         $(OBJS)\corelib_pen.obj \
         $(OBJS)\corelib_popupwin.obj \
@@ -2723,6 +2964,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_utilsgui.obj \
         $(OBJS)\corelib_uxtheme.obj \
         $(OBJS)\corelib_window.obj \
+       $(OBJS)\corelib_helpchm.obj \
+       $(OBJS)\corelib_helpwin.obj \
+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_uuid.obj \
         $(OBJS)\corelib_accel.obj \
         $(OBJS)\corelib_colrdlgg.obj \
         $(OBJS)\corelib_dirdlgg.obj \
@@ -2780,7 +3025,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_bookctrl.obj \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
-       $(OBJS)\corelib_clntdata.obj \
         $(OBJS)\corelib_cmdproc.obj \
         $(OBJS)\corelib_cmndata.obj \
         $(OBJS)\corelib_containr.obj \
@@ -2836,6 +3080,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
         $(OBJS)\corelib_statbar.obj \
+       $(OBJS)\corelib_stockitem.obj \
         $(OBJS)\corelib_tbarbase.obj \
         $(OBJS)\corelib_textcmn.obj \
         $(OBJS)\corelib_timercmn.obj \
@@ -2848,6 +3093,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
         $(OBJS)\corelib_choicdgg.obj \
+       $(OBJS)\corelib_choicbkg.obj \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
@@ -2870,290 +3116,453 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __advdll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_158_p = 
+____DEBUGRUNTIME_175_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_158_p = /D_DEBUG
+____DEBUGRUNTIME_175_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_158_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_175_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_159 = 
+__DEBUGRUNTIME_176 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_159 = d
+__DEBUGRUNTIME_176 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_159 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_176 = $(__DEBUGINFO_3_0)
+!endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datectlg.obj \
+       $(OBJS)\advdll_grid.obj \
+       $(OBJS)\advdll_gridctrl.obj \
+       $(OBJS)\advdll_gridsel.obj \
+       $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
+       $(OBJS)\advdll_tipdlg.obj \
+       $(OBJS)\advdll_wizard.obj \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_sound.obj \
+       $(OBJS)\advdll_taskbar.obj \
+       $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datectlg.obj \
+       $(OBJS)\advdll_grid.obj \
+       $(OBJS)\advdll_gridctrl.obj \
+       $(OBJS)\advdll_gridsel.obj \
+       $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
+       $(OBJS)\advdll_tipdlg.obj \
+       $(OBJS)\advdll_wizard.obj \
+       $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_sound.obj \
+       $(OBJS)\advdll_taskbar.obj \
+       $(OBJS)\advdll_joystick.obj
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  __advlib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_187_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_187_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_187_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_188 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_188 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_188 = $(__DEBUGINFO_3_0)
+!endif
+!if "$(WXUNIV)" == "0"
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datectlg.obj \
+       $(OBJS)\advlib_grid.obj \
+       $(OBJS)\advlib_gridctrl.obj \
+       $(OBJS)\advlib_gridsel.obj \
+       $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
+       $(OBJS)\advlib_tipdlg.obj \
+       $(OBJS)\advlib_wizard.obj \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_sound.obj \
+       $(OBJS)\advlib_taskbar.obj \
+       $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_datectrl.obj
+!endif
+!if "$(WXUNIV)" == "1"
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datectlg.obj \
+       $(OBJS)\advlib_grid.obj \
+       $(OBJS)\advlib_gridctrl.obj \
+       $(OBJS)\advlib_gridsel.obj \
+       $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
+       $(OBJS)\advlib_tipdlg.obj \
+       $(OBJS)\advlib_wizard.obj \
+       $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_sound.obj \
+       $(OBJS)\advlib_taskbar.obj \
+       $(OBJS)\advlib_joystick.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+__mediadll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_170_p = 
+____DEBUGRUNTIME_200_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_170_p = /D_DEBUG
+____DEBUGRUNTIME_200_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_170_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_200_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_171 = 
+__DEBUGRUNTIME_201 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_171 = d
+__DEBUGRUNTIME_201 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_171 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_201 = $(__DEBUGINFO_3_0)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+__medialib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_212_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_212_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_212_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_213 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_213 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_213 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
  __odbcdll___depname = \
-       $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_182_p = 
+____DEBUGRUNTIME_225_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_182_p = /D_DEBUG
+____DEBUGRUNTIME_225_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_182_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_225_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_183 = 
+__DEBUGRUNTIME_226 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_183 = d
+__DEBUGRUNTIME_226 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_183 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_226 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
  __odbclib___depname = \
-       $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_194_p = 
+____DEBUGRUNTIME_237_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_194_p = /D_DEBUG
+____DEBUGRUNTIME_237_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_194_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_237_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_195 = 
+__DEBUGRUNTIME_238 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_195 = d
+__DEBUGRUNTIME_238 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_195 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_238 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  __dbgriddll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_206_p = 
+____DEBUGRUNTIME_250_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_206_p = /D_DEBUG
+____DEBUGRUNTIME_250_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_206_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_250_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_207 = 
+__DEBUGRUNTIME_251 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_207 = d
+__DEBUGRUNTIME_251 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_207 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_251 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  __dbgridlib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_218_p = 
+____DEBUGRUNTIME_262_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_218_p = /D_DEBUG
+____DEBUGRUNTIME_262_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_218_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_262_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_219 = 
+__DEBUGRUNTIME_263 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_219 = d
+__DEBUGRUNTIME_263 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_219 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_263 = $(__DEBUGINFO_3_0)
  !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_230_p = 
+____DEBUGRUNTIME_275_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_230_p = /D_DEBUG
+____DEBUGRUNTIME_275_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_230_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_275_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_231 = 
+__DEBUGRUNTIME_276 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_231 = d
+__DEBUGRUNTIME_276 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_231 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_276 = $(__DEBUGINFO_3_0)
  !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmllib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_242_p = 
+____DEBUGRUNTIME_287_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_242_p = /D_DEBUG
+____DEBUGRUNTIME_287_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_242_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_287_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_243 = 
+__DEBUGRUNTIME_288 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_243 = d
+__DEBUGRUNTIME_288 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_243 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_288 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __xmldll___depname = \
-       $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_254_p = 
+____DEBUGRUNTIME_300_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_254_p = /D_DEBUG
+____DEBUGRUNTIME_300_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_254_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_300_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_255 = 
+__DEBUGRUNTIME_301 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_255 = d
+__DEBUGRUNTIME_301 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_255 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_301 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __xmllib___depname = \
-       $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
+       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_312_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_312_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_312_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_313 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_313 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_313 = $(__DEBUGINFO_3_0)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
+__xrcdll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_325_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_325_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_325_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_326 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_326 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_326 = $(__DEBUGINFO_3_0)
+!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_266_p = 
+____DEBUGRUNTIME_337_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_266_p = /D_DEBUG
+____DEBUGRUNTIME_337_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_266_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_337_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_267 = 
+__DEBUGRUNTIME_338 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_267 = d
+__DEBUGRUNTIME_338 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_267 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_338 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  __gldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_278_p = 
+____DEBUGRUNTIME_350_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_278_p = /D_DEBUG
+____DEBUGRUNTIME_350_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_278_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_350_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_279 = 
+__DEBUGRUNTIME_351 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_279 = d
+__DEBUGRUNTIME_351 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_279 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_351 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
  !if "$(MONOLITHIC)" == "0"
-__WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIBGLDEP_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(MONOLITHIC)" == "1"
  __WXLIB_MONO_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  __gllib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_290_p = 
+____DEBUGRUNTIME_362_p = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_290_p = /D_DEBUG
+____DEBUGRUNTIME_362_p = /D_DEBUG
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_290_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_362_p = $(____DEBUGINFO)
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_291 = 
+__DEBUGRUNTIME_363 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_291 = d
+__DEBUGRUNTIME_363 = d
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_291 = $(__DEBUGINFO_2_3)
+__DEBUGRUNTIME_363 = $(__DEBUGINFO_3_0)
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_22 = /DEBUG
+__DEBUGINFO_28 = /DEBUG
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_22 = 
+__DEBUGINFO_28 = 
  !endif
  !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_22 = 
+__DEBUGINFO_28 = 
  !endif
  !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_22 = /DEBUG
+__DEBUGINFO_28 = /DEBUG
  !endif
  !if "$(USE_GUI)" == "1"
  __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -3192,16 +3601,16 @@ ____DEBUGINFO =
  ____DEBUGINFO = /D_DEBUG
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2_3 = d
+__DEBUGINFO_3_0 = d
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2_3 = 
+__DEBUGINFO_3_0 = 
  !endif
  !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2_3 = 
+__DEBUGINFO_3_0 = 
  !endif
  !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2_3 = d
+__DEBUGINFO_3_0 = d
  !endif
  !if "$(BUILD)" == "debug"
  __OPTIMIZEFLAG = /Od
@@ -3222,10 +3631,10 @@ __EXCEPTIONSFLAG =
  __EXCEPTIONSFLAG = /GR
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_2 = 
+__EXCEPTIONSFLAG_3 = 
  !endif
  !if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_2 = /GX
+__EXCEPTIONSFLAG_3 = /GX
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
  __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
@@ -3245,12 +3654,6 @@ __DEBUG_DEFINE_p = /D__WXDEBUG__
  !if "$(UNICODE)" == "1"
  __UNICODE_DEFINE_p = /D_UNICODE
  !endif
-!if "$(SHARED)" == "0"
-LIBDIRNAME = ..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = ..\..\lib\vc_dll$(CFG)
-!endif
  !if "$(WXUNIV)" == "0"
  __SETUP_H_SUBDIR_FILENAMES = msw
  !endif
@@ -3265,71 +3668,85 @@ $(OBJS):
  
  ### Targets: ###
  
-all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
  
  clean: 
         -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
         -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
         -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
-       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
-       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
-       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.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
  
-$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS)
+$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(WXREGEX_OBJECTS)
@@ -3372,14 +3789,14 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
  <<
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib       /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj  $(MONOLIB_OBJECTS)
+$(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:$@ @<<
         $(MONOLIB_OBJECTS)
@@ -3387,14 +3804,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
+$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(BASELIB_OBJECTS)
@@ -3402,14 +3819,14 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
+$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(NETLIB_OBJECTS)
@@ -3417,14 +3834,14 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dum
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj  $(CORELIB_OBJECTS)
+$(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:$@ @<<
         $(CORELIB_OBJECTS)
@@ -3432,29 +3849,44 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib   /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj  $(ADVLIB_OBJECTS)
+$(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:$@ @<<
         $(ADVLIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(MEDIADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj  $(MEDIALIB_OBJECTS)
+       if exist $@ del $@
+       lib /NOLOGO /OUT:$@ @<<
+       $(MEDIALIB_OBJECTS)
+<<
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(ODBCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(ODBCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
+$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(ODBCLIB_OBJECTS)
@@ -3462,29 +3894,29 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
+$(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:$@ @<<
         $(DBGRIDLIB_OBJECTS)
  <<
  !endif
  
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  <<
  !endif
  
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj  $(HTMLLIB_OBJECTS)
+!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:$@ @<<
         $(HTMLLIB_OBJECTS)
@@ -3492,29 +3924,44 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.li
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
+$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(XMLLIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(XRCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+<<
+!endif
+
+!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:$@ @<<
+       $(XRCLIB_OBJECTS)
+<<
+!endif
+
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  <<
  !endif
  
  !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj  $(GLLIB_OBJECTS)
+$(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:$@ @<<
         $(GLLIB_OBJECTS)
@@ -3544,7 +3991,7 @@ $(SETUPHDIR)\wx\setup.h:
  build_cfg_file: $(SETUPHDIR)
         @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
         @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
-       @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)
         @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
         @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
         @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -3609,18 +4056,12 @@ $(OBJS)\wxzlib_zutil.obj: ..\..\src\zlib\zutil.c
  $(OBJS)\wxzlib_inflate.obj: ..\..\src\zlib\inflate.c
         $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
  
-$(OBJS)\wxzlib_infblock.obj: ..\..\src\zlib\infblock.c
+$(OBJS)\wxzlib_infback.obj: ..\..\src\zlib\infback.c
         $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
  
  $(OBJS)\wxzlib_inftrees.obj: ..\..\src\zlib\inftrees.c
         $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
  
-$(OBJS)\wxzlib_infcodes.obj: ..\..\src\zlib\infcodes.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
-
-$(OBJS)\wxzlib_infutil.obj: ..\..\src\zlib\infutil.c
-       $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
-
  $(OBJS)\wxzlib_inffast.obj: ..\..\src\zlib\inffast.c
         $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $**
  
@@ -3825,6 +4266,9 @@ $(OBJS)\wxtiff_tif_close.obj: ..\..\src\tiff\tif_close.c
  $(OBJS)\wxtiff_tif_codec.obj: ..\..\src\tiff\tif_codec.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
+$(OBJS)\wxtiff_tif_color.obj: ..\..\src\tiff\tif_color.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+
  $(OBJS)\wxtiff_tif_compress.obj: ..\..\src\tiff\tif_compress.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
@@ -3927,6 +4371,12 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
  $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -3981,9 +4431,6 @@ $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
  $(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_gzstream.obj: ..\..\src\common\gzstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
  $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4029,6 +4476,12 @@ $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp
  $(OBJS)\monodll_regex.obj: ..\..\src\common\regex.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4056,8 +4509,8 @@ $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
  $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_unzip.obj: ..\..\src\common\unzip.c
-       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
+$(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4086,12 +4539,18 @@ $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
  $(OBJS)\monodll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4104,6 +4563,12 @@ $(OBJS)\monodll_registry.obj: ..\..\src\msw\registry.cpp
  $(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4164,8 +4629,8 @@ $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp
  $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c
-       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
+$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4173,13 +4638,13 @@ $(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_dragimag.obj: ..\..\src\msw\dragimag.cpp
+$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
+$(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+$(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
@@ -4233,6 +4698,9 @@ $(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
  $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4302,46 +4770,13 @@ $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
  $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
+$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
+$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+$(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
@@ -4419,184 +4854,279 @@ $(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp
  $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
+$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
+$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
+$(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp
+$(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp
+$(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp
+$(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
+$(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp
+$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp
+$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp
+$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp
+$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp
+$(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
+$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp
+$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.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) $**
+
+$(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+$(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp
+$(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp
+$(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
+$(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp
+$(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
+$(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp
+$(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp
+$(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp
+$(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
+$(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+$(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-       $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
+$(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
+$(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
+$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
+$(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
+$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+$(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+$(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+$(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+$(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
@@ -4670,6 +5200,26 @@ $(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4775,16 +5325,6 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.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) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4925,6 +5465,16 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.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) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4965,11 +5515,6 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.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) $**
@@ -5245,6 +5790,11 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5305,6 +5855,11 @@ $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5400,12 +5955,93 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.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_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.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_sashwin.obj: ..\..\src\generic\sashwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.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) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -5460,9 +6096,6 @@ $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
  $(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_gzstream.obj: ..\..\src\common\gzstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
  $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -5508,6 +6141,12 @@ $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
  $(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -5535,8 +6174,8 @@ $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
  $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_unzip.obj: ..\..\src\common\unzip.c
-       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
+$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -5565,12 +6204,18 @@ $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
  $(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -5583,6 +6228,12 @@ $(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp
  $(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -5643,8 +6294,8 @@ $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp
  $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c
-       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
+$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -5652,13 +6303,13 @@ $(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_dragimag.obj: ..\..\src\msw\dragimag.cpp
+$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
+$(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+$(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
@@ -5712,6 +6363,9 @@ $(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
  $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -5781,121 +6435,208 @@ $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
  $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
+$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
+$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+$(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
+$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.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_htmlcell.obj: ..\..\src\html\htmlcell.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_htmlpars.obj: ..\..\src\html\htmlpars.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_htmltag.obj: ..\..\src\html\htmltag.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_htmlwin.obj: ..\..\src\html\htmlwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_htmprint.obj: ..\..\src\html\htmprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_dflist.obj: ..\..\src\html\m_dflist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_fonts.obj: ..\..\src\html\m_fonts.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_hline.obj: ..\..\src\html\m_hline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_image.obj: ..\..\src\html\m_image.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_layout.obj: ..\..\src\html\m_layout.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_links.obj: ..\..\src\html\m_links.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_db.obj: ..\..\src\common\db.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
+$(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
+$(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+$(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
+$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
+$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+$(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
+$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+$(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
+$(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
+$(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp
+$(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
+$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
+$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp
+$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_htmlpars.obj: ..\..\src\html\htmlpars.cpp
+$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_htmltag.obj: ..\..\src\html\htmltag.cpp
+$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_htmlwin.obj: ..\..\src\html\htmlwin.cpp
+$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_htmprint.obj: ..\..\src\html\htmprint.cpp
+$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_dflist.obj: ..\..\src\html\m_dflist.cpp
+$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_fonts.obj: ..\..\src\html\m_fonts.cpp
+$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_hline.obj: ..\..\src\html\m_hline.cpp
+$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_image.obj: ..\..\src\html\m_image.cpp
+$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_layout.obj: ..\..\src\html\m_layout.cpp
+$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_links.obj: ..\..\src\html\m_links.cpp
+$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp
+$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp
+$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp
+$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp
+$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp
+$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
+$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_db.obj: ..\..\src\common\db.cpp
+$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp
+$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
+$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
@@ -5979,11 +6720,6 @@ $(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_display.obj: ..\..\src\msw\display.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6025,17 +6761,7 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-       $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
+$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
@@ -6049,11 +6775,6 @@ $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6074,11 +6795,6 @@ $(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6149,6 +6865,26 @@ $(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6254,16 +6990,6 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.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) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6404,6 +7130,16 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.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) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6444,11 +7180,6 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.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) $**
@@ -6724,6 +7455,11 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6784,6 +7520,11 @@ $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.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) $**
@@ -6879,12 +7620,93 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.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_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -6939,9 +7761,6 @@ $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
  $(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
-$(OBJS)\basedll_gzstream.obj: ..\..\src\common\gzstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
-
  $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -6987,6 +7806,12 @@ $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
  $(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -7014,8 +7839,8 @@ $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp
  $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
-$(OBJS)\basedll_unzip.obj: ..\..\src\common\unzip.c
-       $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) $**
+$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
@@ -7044,12 +7869,18 @@ $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
  $(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -7062,6 +7893,12 @@ $(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp
  $(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -7098,6 +7935,12 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
  $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -7152,9 +7995,6 @@ $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
  $(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
-$(OBJS)\baselib_gzstream.obj: ..\..\src\common\gzstream.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
-
  $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -7200,6 +8040,12 @@ $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
  $(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -7227,8 +8073,8 @@ $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp
  $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
-$(OBJS)\baselib_unzip.obj: ..\..\src\common\unzip.c
-       $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) $**
+$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
@@ -7257,12 +8103,18 @@ $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
  $(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -7275,6 +8127,12 @@ $(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp
  $(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -7338,8 +8196,8 @@ $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp
  $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
-$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.c
-       $(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $**
+$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
  $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
@@ -7377,8 +8235,8 @@ $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp
  $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
  
-$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.c
-       $(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $**
+$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
  
  $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
@@ -7410,13 +8268,13 @@ $(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_dragimag.obj: ..\..\src\msw\dragimag.cpp
+$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
-$(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
+$(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
-$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+$(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
@@ -7470,6 +8328,9 @@ $(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
  $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
+$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+
  $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -7614,11 +8475,6 @@ $(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_display.obj: ..\..\src\msw\display.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -7660,32 +8516,17 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-       $(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
+$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
+$(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
@@ -7709,11 +8550,6 @@ $(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -7784,6 +8620,26 @@ $(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -7889,16 +8745,6 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.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) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -8039,6 +8885,16 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.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) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -8079,11 +8935,6 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clntdata.obj: ..\..\src\common\clntdata.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) $**
@@ -8359,6 +9210,11 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -8419,6 +9275,11 @@ $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.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) $**
@@ -8541,13 +9402,13 @@ $(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_dragimag.obj: ..\..\src\msw\dragimag.cpp
+$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
-$(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
+$(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
-$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+$(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
@@ -8601,6 +9462,9 @@ $(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
  $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
+$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+
  $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
@@ -8745,11 +9609,6 @@ $(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_display.obj: ..\..\src\msw\display.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -8791,17 +9650,7 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-       $(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
+$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
@@ -8815,11 +9664,6 @@ $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -8840,11 +9684,6 @@ $(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -8915,6 +9754,26 @@ $(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -9020,16 +9879,6 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.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) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -9170,6 +10019,16 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.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) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -9210,11 +10069,6 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clntdata.obj: ..\..\src\common\clntdata.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) $**
@@ -9490,6 +10344,11 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -9550,6 +10409,11 @@ $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.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) $**
@@ -9648,9 +10512,15 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
  $(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -9681,21 +10551,27 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
  $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
-$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
-
  $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
+$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -9726,15 +10602,33 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
  $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
-$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
-
  $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\mediadll_dummy.obj: ..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+
+$(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+
+$(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+
+$(OBJS)\medialib_mediactrl.obj: ..\..\src\msw\mediactrl.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 $**
  
@@ -9921,6 +10815,252 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
  $(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_dummy.obj: ..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.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_listb.obj: ..\..\src\xrc\xh_listb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.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) $**
+
+$(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrclib_dummy.obj: ..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.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_listb.obj: ..\..\src\xrc\xh_listb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.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) $**
+
+$(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
@@ -9932,3 +11072,4 @@ $(OBJS)\gllib_dummy.obj: ..\..\src\msw\dummy.cpp
  
  $(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) $**
+