define ATTRIBUTE_PRINTF(m,n) and not just ATTRIBUTE_PRINTF as nothing when the compil...

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

index 3702d67a4510ce12309860f9622e40d93c2f2e94..a4df0755e75bbec90036dc5b6946c8f067382658 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -13,39 +13,40 @@
  ### Variables: ###
  
  MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
  ### Variables: ###
  
  MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
         WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
         WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
-       DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \
-       USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_XRC="$(USE_XRC)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" \
+       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
-       USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       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)"
         CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
         RUNTIME_LIBS="$(RUNTIME_LIBS)"
-WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
  OBJS = \
  OBJS = \
-       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
+       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = ..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__UNICODE_DEFINE_p) $(CPPFLAGS) \
-       $(CFLAGS)
+WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\include \
+       /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
         $(OBJS)\wxregex_regexec.obj \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
         $(OBJS)\wxregex_regexec.obj \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
-WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME_16) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_15_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) \
-       $(CFLAGS)
+WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
         $(OBJS)\wxzlib_compress.obj \
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
         $(OBJS)\wxzlib_compress.obj \
@@ -59,10 +60,9 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_infback.obj \
         $(OBJS)\wxzlib_inftrees.obj \
         $(OBJS)\wxzlib_inffast.obj
         $(OBJS)\wxzlib_infback.obj \
         $(OBJS)\wxzlib_inftrees.obj \
         $(OBJS)\wxzlib_inffast.obj
-WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME_29) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_28_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
+WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
         $(OBJS)\wxpng_pngerror.obj \
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
         $(OBJS)\wxpng_pngerror.obj \
@@ -81,10 +81,9 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwrite.obj \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
         $(OBJS)\wxpng_pngwrite.obj \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
-WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME_42) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_41_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
+WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
         $(OBJS)\wxjpeg_jutils.obj \
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
         $(OBJS)\wxjpeg_jutils.obj \
@@ -132,10 +131,10 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jquant1.obj \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
         $(OBJS)\wxjpeg_jquant1.obj \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
-WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME_55) /DWIN32 \
-       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_54_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I..\..\src\zlib /I..\..\src\jpeg $(CPPFLAGS) $(CFLAGS)
+WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \
+       $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_win32.obj \
         $(OBJS)\wxtiff_tif_aux.obj \
  WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_win32.obj \
         $(OBJS)\wxtiff_tif_aux.obj \
@@ -149,6 +148,7 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_dirwrite.obj \
         $(OBJS)\wxtiff_tif_dumpmode.obj \
         $(OBJS)\wxtiff_tif_error.obj \
         $(OBJS)\wxtiff_tif_dirwrite.obj \
         $(OBJS)\wxtiff_tif_dumpmode.obj \
         $(OBJS)\wxtiff_tif_error.obj \
+       $(OBJS)\wxtiff_tif_extension.obj \
         $(OBJS)\wxtiff_tif_fax3.obj \
         $(OBJS)\wxtiff_tif_fax3sm.obj \
         $(OBJS)\wxtiff_tif_getimage.obj \
         $(OBJS)\wxtiff_tif_fax3.obj \
         $(OBJS)\wxtiff_tif_fax3sm.obj \
         $(OBJS)\wxtiff_tif_getimage.obj \
@@ -171,41 +171,47 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_warning.obj \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
         $(OBJS)\wxtiff_tif_warning.obj \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
-WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME_68) /DWIN32 \
+WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_67_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
-       /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(LIBDIRNAME) \
+       /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.obj \
         $(OBJS)\wxexpat_xmlrole.obj \
         $(OBJS)\wxexpat_xmltok.obj
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.obj \
         $(OBJS)\wxexpat_xmlrole.obj \
         $(OBJS)\wxexpat_xmltok.obj
-MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME_82) /DWIN32 \
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_81_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)
-MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME_82) /DWIN32 \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \
+       $(CPPFLAGS) $(CFLAGS)
+MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_87)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_81_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 /DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
  MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dummy.obj \
         $(OBJS)\monodll_version.res \
         $(OBJS)\monodll_appbase.obj \
  MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dummy.obj \
         $(OBJS)\monodll_version.res \
         $(OBJS)\monodll_appbase.obj \
+       $(OBJS)\monodll_arcall.obj \
+       $(OBJS)\monodll_arcfind.obj \
         $(OBJS)\monodll_archive.obj \
         $(OBJS)\monodll_archive.obj \
+       $(OBJS)\monodll_arrstr.obj \
         $(OBJS)\monodll_clntdata.obj \
         $(OBJS)\monodll_cmdline.obj \
         $(OBJS)\monodll_config.obj \
         $(OBJS)\monodll_clntdata.obj \
         $(OBJS)\monodll_cmdline.obj \
         $(OBJS)\monodll_config.obj \
+       $(OBJS)\monodll_convauto.obj \
         $(OBJS)\monodll_datetime.obj \
         $(OBJS)\monodll_datstrm.obj \
         $(OBJS)\monodll_dircmn.obj \
         $(OBJS)\monodll_datetime.obj \
         $(OBJS)\monodll_datstrm.obj \
         $(OBJS)\monodll_dircmn.obj \
@@ -216,12 +222,16 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_extended.obj \
         $(OBJS)\monodll_ffile.obj \
         $(OBJS)\monodll_file.obj \
         $(OBJS)\monodll_extended.obj \
         $(OBJS)\monodll_ffile.obj \
         $(OBJS)\monodll_file.obj \
+       $(OBJS)\monodll_fileback.obj \
         $(OBJS)\monodll_fileconf.obj \
         $(OBJS)\monodll_filefn.obj \
         $(OBJS)\monodll_filename.obj \
         $(OBJS)\monodll_filesys.obj \
         $(OBJS)\monodll_fileconf.obj \
         $(OBJS)\monodll_filefn.obj \
         $(OBJS)\monodll_filename.obj \
         $(OBJS)\monodll_filesys.obj \
+       $(OBJS)\monodll_filtall.obj \
+       $(OBJS)\monodll_filtfind.obj \
         $(OBJS)\monodll_fmapbase.obj \
         $(OBJS)\monodll_fmapbase.obj \
-       $(OBJS)\monodll_fs_zip.obj \
+       $(OBJS)\monodll_fs_arc.obj \
+       $(OBJS)\monodll_fs_filter.obj \
         $(OBJS)\monodll_hash.obj \
         $(OBJS)\monodll_hashmap.obj \
         $(OBJS)\monodll_init.obj \
         $(OBJS)\monodll_hash.obj \
         $(OBJS)\monodll_hashmap.obj \
         $(OBJS)\monodll_init.obj \
@@ -235,6 +245,8 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_module.obj \
         $(OBJS)\monodll_mstream.obj \
         $(OBJS)\monodll_object.obj \
         $(OBJS)\monodll_module.obj \
         $(OBJS)\monodll_mstream.obj \
         $(OBJS)\monodll_object.obj \
+       $(OBJS)\monodll_platinfo.obj \
+       $(OBJS)\monodll_powercmn.obj \
         $(OBJS)\monodll_process.obj \
         $(OBJS)\monodll_regex.obj \
         $(OBJS)\monodll_stdpbase.obj \
         $(OBJS)\monodll_process.obj \
         $(OBJS)\monodll_regex.obj \
         $(OBJS)\monodll_stdpbase.obj \
@@ -243,15 +255,20 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_strconv.obj \
         $(OBJS)\monodll_stream.obj \
         $(OBJS)\monodll_string.obj \
         $(OBJS)\monodll_strconv.obj \
         $(OBJS)\monodll_stream.obj \
         $(OBJS)\monodll_string.obj \
+       $(OBJS)\monodll_stringimpl.obj \
+       $(OBJS)\monodll_strvararg.obj \
         $(OBJS)\monodll_sysopt.obj \
         $(OBJS)\monodll_sysopt.obj \
+       $(OBJS)\monodll_tarstrm.obj \
         $(OBJS)\monodll_textbuf.obj \
         $(OBJS)\monodll_textfile.obj \
         $(OBJS)\monodll_tokenzr.obj \
         $(OBJS)\monodll_txtstrm.obj \
         $(OBJS)\monodll_textbuf.obj \
         $(OBJS)\monodll_textfile.obj \
         $(OBJS)\monodll_tokenzr.obj \
         $(OBJS)\monodll_txtstrm.obj \
+       $(OBJS)\monodll_unichar.obj \
         $(OBJS)\monodll_uri.obj \
         $(OBJS)\monodll_variant.obj \
         $(OBJS)\monodll_wfstream.obj \
         $(OBJS)\monodll_uri.obj \
         $(OBJS)\monodll_variant.obj \
         $(OBJS)\monodll_wfstream.obj \
-       $(OBJS)\monodll_wxchar.obj \
+       $(OBJS)\monodll_wxcrt.obj \
+       $(OBJS)\monodll_wxprintf.obj \
         $(OBJS)\monodll_xti.obj \
         $(OBJS)\monodll_xtistrm.obj \
         $(OBJS)\monodll_zipstrm.obj \
         $(OBJS)\monodll_xti.obj \
         $(OBJS)\monodll_xtistrm.obj \
         $(OBJS)\monodll_zipstrm.obj \
@@ -263,6 +280,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dir.obj \
         $(OBJS)\monodll_dlmsw.obj \
         $(OBJS)\monodll_mimetype.obj \
         $(OBJS)\monodll_dir.obj \
         $(OBJS)\monodll_dlmsw.obj \
         $(OBJS)\monodll_mimetype.obj \
+       $(OBJS)\monodll_power.obj \
         $(OBJS)\monodll_regconf.obj \
         $(OBJS)\monodll_registry.obj \
         $(OBJS)\monodll_snglinst.obj \
         $(OBJS)\monodll_regconf.obj \
         $(OBJS)\monodll_registry.obj \
         $(OBJS)\monodll_snglinst.obj \
@@ -293,32 +311,37 @@ MONODLL_OBJECTS =  \
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj \
         $(OBJS)\monodll_xtixml.obj
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj \
         $(OBJS)\monodll_xtixml.obj
-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME_95) /DWIN32 \
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_94_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME_95) /DWIN32 \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_94_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dummy.obj \
         $(OBJS)\monolib_appbase.obj \
  MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dummy.obj \
         $(OBJS)\monolib_appbase.obj \
+       $(OBJS)\monolib_arcall.obj \
+       $(OBJS)\monolib_arcfind.obj \
         $(OBJS)\monolib_archive.obj \
         $(OBJS)\monolib_archive.obj \
+       $(OBJS)\monolib_arrstr.obj \
         $(OBJS)\monolib_clntdata.obj \
         $(OBJS)\monolib_cmdline.obj \
         $(OBJS)\monolib_config.obj \
         $(OBJS)\monolib_clntdata.obj \
         $(OBJS)\monolib_cmdline.obj \
         $(OBJS)\monolib_config.obj \
+       $(OBJS)\monolib_convauto.obj \
         $(OBJS)\monolib_datetime.obj \
         $(OBJS)\monolib_datstrm.obj \
         $(OBJS)\monolib_dircmn.obj \
         $(OBJS)\monolib_datetime.obj \
         $(OBJS)\monolib_datstrm.obj \
         $(OBJS)\monolib_dircmn.obj \
@@ -329,12 +352,16 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_extended.obj \
         $(OBJS)\monolib_ffile.obj \
         $(OBJS)\monolib_file.obj \
         $(OBJS)\monolib_extended.obj \
         $(OBJS)\monolib_ffile.obj \
         $(OBJS)\monolib_file.obj \
+       $(OBJS)\monolib_fileback.obj \
         $(OBJS)\monolib_fileconf.obj \
         $(OBJS)\monolib_filefn.obj \
         $(OBJS)\monolib_filename.obj \
         $(OBJS)\monolib_filesys.obj \
         $(OBJS)\monolib_fileconf.obj \
         $(OBJS)\monolib_filefn.obj \
         $(OBJS)\monolib_filename.obj \
         $(OBJS)\monolib_filesys.obj \
+       $(OBJS)\monolib_filtall.obj \
+       $(OBJS)\monolib_filtfind.obj \
         $(OBJS)\monolib_fmapbase.obj \
         $(OBJS)\monolib_fmapbase.obj \
-       $(OBJS)\monolib_fs_zip.obj \
+       $(OBJS)\monolib_fs_arc.obj \
+       $(OBJS)\monolib_fs_filter.obj \
         $(OBJS)\monolib_hash.obj \
         $(OBJS)\monolib_hashmap.obj \
         $(OBJS)\monolib_init.obj \
         $(OBJS)\monolib_hash.obj \
         $(OBJS)\monolib_hashmap.obj \
         $(OBJS)\monolib_init.obj \
@@ -348,6 +375,8 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_module.obj \
         $(OBJS)\monolib_mstream.obj \
         $(OBJS)\monolib_object.obj \
         $(OBJS)\monolib_module.obj \
         $(OBJS)\monolib_mstream.obj \
         $(OBJS)\monolib_object.obj \
+       $(OBJS)\monolib_platinfo.obj \
+       $(OBJS)\monolib_powercmn.obj \
         $(OBJS)\monolib_process.obj \
         $(OBJS)\monolib_regex.obj \
         $(OBJS)\monolib_stdpbase.obj \
         $(OBJS)\monolib_process.obj \
         $(OBJS)\monolib_regex.obj \
         $(OBJS)\monolib_stdpbase.obj \
@@ -356,15 +385,20 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_strconv.obj \
         $(OBJS)\monolib_stream.obj \
         $(OBJS)\monolib_string.obj \
         $(OBJS)\monolib_strconv.obj \
         $(OBJS)\monolib_stream.obj \
         $(OBJS)\monolib_string.obj \
+       $(OBJS)\monolib_stringimpl.obj \
+       $(OBJS)\monolib_strvararg.obj \
         $(OBJS)\monolib_sysopt.obj \
         $(OBJS)\monolib_sysopt.obj \
+       $(OBJS)\monolib_tarstrm.obj \
         $(OBJS)\monolib_textbuf.obj \
         $(OBJS)\monolib_textfile.obj \
         $(OBJS)\monolib_tokenzr.obj \
         $(OBJS)\monolib_txtstrm.obj \
         $(OBJS)\monolib_textbuf.obj \
         $(OBJS)\monolib_textfile.obj \
         $(OBJS)\monolib_tokenzr.obj \
         $(OBJS)\monolib_txtstrm.obj \
+       $(OBJS)\monolib_unichar.obj \
         $(OBJS)\monolib_uri.obj \
         $(OBJS)\monolib_variant.obj \
         $(OBJS)\monolib_wfstream.obj \
         $(OBJS)\monolib_uri.obj \
         $(OBJS)\monolib_variant.obj \
         $(OBJS)\monolib_wfstream.obj \
-       $(OBJS)\monolib_wxchar.obj \
+       $(OBJS)\monolib_wxcrt.obj \
+       $(OBJS)\monolib_wxprintf.obj \
         $(OBJS)\monolib_xti.obj \
         $(OBJS)\monolib_xtistrm.obj \
         $(OBJS)\monolib_zipstrm.obj \
         $(OBJS)\monolib_xti.obj \
         $(OBJS)\monolib_xtistrm.obj \
         $(OBJS)\monolib_zipstrm.obj \
@@ -376,6 +410,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dir.obj \
         $(OBJS)\monolib_dlmsw.obj \
         $(OBJS)\monolib_mimetype.obj \
         $(OBJS)\monolib_dir.obj \
         $(OBJS)\monolib_dlmsw.obj \
         $(OBJS)\monolib_mimetype.obj \
+       $(OBJS)\monolib_power.obj \
         $(OBJS)\monolib_regconf.obj \
         $(OBJS)\monolib_registry.obj \
         $(OBJS)\monolib_snglinst.obj \
         $(OBJS)\monolib_regconf.obj \
         $(OBJS)\monolib_registry.obj \
         $(OBJS)\monolib_snglinst.obj \
@@ -406,34 +441,39 @@ MONOLIB_OBJECTS =  \
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj \
         $(OBJS)\monolib_xtixml.obj
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj \
         $(OBJS)\monolib_xtixml.obj
-BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME_109) /DWIN32 \
+BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_108_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME_109) /DWIN32 \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE \
+       /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_114)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_108_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE \
+       /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
         $(OBJS)\basedll_version.res \
         $(OBJS)\basedll_appbase.obj \
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
         $(OBJS)\basedll_version.res \
         $(OBJS)\basedll_appbase.obj \
+       $(OBJS)\basedll_arcall.obj \
+       $(OBJS)\basedll_arcfind.obj \
         $(OBJS)\basedll_archive.obj \
         $(OBJS)\basedll_archive.obj \
+       $(OBJS)\basedll_arrstr.obj \
         $(OBJS)\basedll_clntdata.obj \
         $(OBJS)\basedll_cmdline.obj \
         $(OBJS)\basedll_config.obj \
         $(OBJS)\basedll_clntdata.obj \
         $(OBJS)\basedll_cmdline.obj \
         $(OBJS)\basedll_config.obj \
+       $(OBJS)\basedll_convauto.obj \
         $(OBJS)\basedll_datetime.obj \
         $(OBJS)\basedll_datstrm.obj \
         $(OBJS)\basedll_dircmn.obj \
         $(OBJS)\basedll_datetime.obj \
         $(OBJS)\basedll_datstrm.obj \
         $(OBJS)\basedll_dircmn.obj \
@@ -444,12 +484,16 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_extended.obj \
         $(OBJS)\basedll_ffile.obj \
         $(OBJS)\basedll_file.obj \
         $(OBJS)\basedll_extended.obj \
         $(OBJS)\basedll_ffile.obj \
         $(OBJS)\basedll_file.obj \
+       $(OBJS)\basedll_fileback.obj \
         $(OBJS)\basedll_fileconf.obj \
         $(OBJS)\basedll_filefn.obj \
         $(OBJS)\basedll_filename.obj \
         $(OBJS)\basedll_filesys.obj \
         $(OBJS)\basedll_fileconf.obj \
         $(OBJS)\basedll_filefn.obj \
         $(OBJS)\basedll_filename.obj \
         $(OBJS)\basedll_filesys.obj \
+       $(OBJS)\basedll_filtall.obj \
+       $(OBJS)\basedll_filtfind.obj \
         $(OBJS)\basedll_fmapbase.obj \
         $(OBJS)\basedll_fmapbase.obj \
-       $(OBJS)\basedll_fs_zip.obj \
+       $(OBJS)\basedll_fs_arc.obj \
+       $(OBJS)\basedll_fs_filter.obj \
         $(OBJS)\basedll_hash.obj \
         $(OBJS)\basedll_hashmap.obj \
         $(OBJS)\basedll_init.obj \
         $(OBJS)\basedll_hash.obj \
         $(OBJS)\basedll_hashmap.obj \
         $(OBJS)\basedll_init.obj \
@@ -463,6 +507,8 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_module.obj \
         $(OBJS)\basedll_mstream.obj \
         $(OBJS)\basedll_object.obj \
         $(OBJS)\basedll_module.obj \
         $(OBJS)\basedll_mstream.obj \
         $(OBJS)\basedll_object.obj \
+       $(OBJS)\basedll_platinfo.obj \
+       $(OBJS)\basedll_powercmn.obj \
         $(OBJS)\basedll_process.obj \
         $(OBJS)\basedll_regex.obj \
         $(OBJS)\basedll_stdpbase.obj \
         $(OBJS)\basedll_process.obj \
         $(OBJS)\basedll_regex.obj \
         $(OBJS)\basedll_stdpbase.obj \
@@ -471,15 +517,20 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_strconv.obj \
         $(OBJS)\basedll_stream.obj \
         $(OBJS)\basedll_string.obj \
         $(OBJS)\basedll_strconv.obj \
         $(OBJS)\basedll_stream.obj \
         $(OBJS)\basedll_string.obj \
+       $(OBJS)\basedll_stringimpl.obj \
+       $(OBJS)\basedll_strvararg.obj \
         $(OBJS)\basedll_sysopt.obj \
         $(OBJS)\basedll_sysopt.obj \
+       $(OBJS)\basedll_tarstrm.obj \
         $(OBJS)\basedll_textbuf.obj \
         $(OBJS)\basedll_textfile.obj \
         $(OBJS)\basedll_tokenzr.obj \
         $(OBJS)\basedll_txtstrm.obj \
         $(OBJS)\basedll_textbuf.obj \
         $(OBJS)\basedll_textfile.obj \
         $(OBJS)\basedll_tokenzr.obj \
         $(OBJS)\basedll_txtstrm.obj \
+       $(OBJS)\basedll_unichar.obj \
         $(OBJS)\basedll_uri.obj \
         $(OBJS)\basedll_variant.obj \
         $(OBJS)\basedll_wfstream.obj \
         $(OBJS)\basedll_uri.obj \
         $(OBJS)\basedll_variant.obj \
         $(OBJS)\basedll_wfstream.obj \
-       $(OBJS)\basedll_wxchar.obj \
+       $(OBJS)\basedll_wxcrt.obj \
+       $(OBJS)\basedll_wxprintf.obj \
         $(OBJS)\basedll_xti.obj \
         $(OBJS)\basedll_xtistrm.obj \
         $(OBJS)\basedll_zipstrm.obj \
         $(OBJS)\basedll_xti.obj \
         $(OBJS)\basedll_xtistrm.obj \
         $(OBJS)\basedll_zipstrm.obj \
@@ -491,6 +542,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dir.obj \
         $(OBJS)\basedll_dlmsw.obj \
         $(OBJS)\basedll_mimetype.obj \
         $(OBJS)\basedll_dir.obj \
         $(OBJS)\basedll_dlmsw.obj \
         $(OBJS)\basedll_mimetype.obj \
+       $(OBJS)\basedll_power.obj \
         $(OBJS)\basedll_regconf.obj \
         $(OBJS)\basedll_registry.obj \
         $(OBJS)\basedll_snglinst.obj \
         $(OBJS)\basedll_regconf.obj \
         $(OBJS)\basedll_registry.obj \
         $(OBJS)\basedll_snglinst.obj \
@@ -506,32 +558,38 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_main.obj \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
         $(OBJS)\basedll_main.obj \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME_122) /DWIN32 \
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_121_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME_122) /DWIN32 \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \
+       $(CPPFLAGS) $(CFLAGS)
+BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
-       $(____DEBUGRUNTIME_121_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
         $(OBJS)\baselib_appbase.obj \
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
         $(OBJS)\baselib_appbase.obj \
+       $(OBJS)\baselib_arcall.obj \
+       $(OBJS)\baselib_arcfind.obj \
         $(OBJS)\baselib_archive.obj \
         $(OBJS)\baselib_archive.obj \
+       $(OBJS)\baselib_arrstr.obj \
         $(OBJS)\baselib_clntdata.obj \
         $(OBJS)\baselib_cmdline.obj \
         $(OBJS)\baselib_config.obj \
         $(OBJS)\baselib_clntdata.obj \
         $(OBJS)\baselib_cmdline.obj \
         $(OBJS)\baselib_config.obj \
+       $(OBJS)\baselib_convauto.obj \
         $(OBJS)\baselib_datetime.obj \
         $(OBJS)\baselib_datstrm.obj \
         $(OBJS)\baselib_dircmn.obj \
         $(OBJS)\baselib_datetime.obj \
         $(OBJS)\baselib_datstrm.obj \
         $(OBJS)\baselib_dircmn.obj \
@@ -542,12 +600,16 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_extended.obj \
         $(OBJS)\baselib_ffile.obj \
         $(OBJS)\baselib_file.obj \
         $(OBJS)\baselib_extended.obj \
         $(OBJS)\baselib_ffile.obj \
         $(OBJS)\baselib_file.obj \
+       $(OBJS)\baselib_fileback.obj \
         $(OBJS)\baselib_fileconf.obj \
         $(OBJS)\baselib_filefn.obj \
         $(OBJS)\baselib_filename.obj \
         $(OBJS)\baselib_filesys.obj \
         $(OBJS)\baselib_fileconf.obj \
         $(OBJS)\baselib_filefn.obj \
         $(OBJS)\baselib_filename.obj \
         $(OBJS)\baselib_filesys.obj \
+       $(OBJS)\baselib_filtall.obj \
+       $(OBJS)\baselib_filtfind.obj \
         $(OBJS)\baselib_fmapbase.obj \
         $(OBJS)\baselib_fmapbase.obj \
-       $(OBJS)\baselib_fs_zip.obj \
+       $(OBJS)\baselib_fs_arc.obj \
+       $(OBJS)\baselib_fs_filter.obj \
         $(OBJS)\baselib_hash.obj \
         $(OBJS)\baselib_hashmap.obj \
         $(OBJS)\baselib_init.obj \
         $(OBJS)\baselib_hash.obj \
         $(OBJS)\baselib_hashmap.obj \
         $(OBJS)\baselib_init.obj \
@@ -561,6 +623,8 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_module.obj \
         $(OBJS)\baselib_mstream.obj \
         $(OBJS)\baselib_object.obj \
         $(OBJS)\baselib_module.obj \
         $(OBJS)\baselib_mstream.obj \
         $(OBJS)\baselib_object.obj \
+       $(OBJS)\baselib_platinfo.obj \
+       $(OBJS)\baselib_powercmn.obj \
         $(OBJS)\baselib_process.obj \
         $(OBJS)\baselib_regex.obj \
         $(OBJS)\baselib_stdpbase.obj \
         $(OBJS)\baselib_process.obj \
         $(OBJS)\baselib_regex.obj \
         $(OBJS)\baselib_stdpbase.obj \
@@ -569,15 +633,20 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_strconv.obj \
         $(OBJS)\baselib_stream.obj \
         $(OBJS)\baselib_string.obj \
         $(OBJS)\baselib_strconv.obj \
         $(OBJS)\baselib_stream.obj \
         $(OBJS)\baselib_string.obj \
+       $(OBJS)\baselib_stringimpl.obj \
+       $(OBJS)\baselib_strvararg.obj \
         $(OBJS)\baselib_sysopt.obj \
         $(OBJS)\baselib_sysopt.obj \
+       $(OBJS)\baselib_tarstrm.obj \
         $(OBJS)\baselib_textbuf.obj \
         $(OBJS)\baselib_textfile.obj \
         $(OBJS)\baselib_tokenzr.obj \
         $(OBJS)\baselib_txtstrm.obj \
         $(OBJS)\baselib_textbuf.obj \
         $(OBJS)\baselib_textfile.obj \
         $(OBJS)\baselib_tokenzr.obj \
         $(OBJS)\baselib_txtstrm.obj \
+       $(OBJS)\baselib_unichar.obj \
         $(OBJS)\baselib_uri.obj \
         $(OBJS)\baselib_variant.obj \
         $(OBJS)\baselib_wfstream.obj \
         $(OBJS)\baselib_uri.obj \
         $(OBJS)\baselib_variant.obj \
         $(OBJS)\baselib_wfstream.obj \
-       $(OBJS)\baselib_wxchar.obj \
+       $(OBJS)\baselib_wxcrt.obj \
+       $(OBJS)\baselib_wxprintf.obj \
         $(OBJS)\baselib_xti.obj \
         $(OBJS)\baselib_xtistrm.obj \
         $(OBJS)\baselib_zipstrm.obj \
         $(OBJS)\baselib_xti.obj \
         $(OBJS)\baselib_xtistrm.obj \
         $(OBJS)\baselib_zipstrm.obj \
@@ -589,6 +658,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dir.obj \
         $(OBJS)\baselib_dlmsw.obj \
         $(OBJS)\baselib_mimetype.obj \
         $(OBJS)\baselib_dir.obj \
         $(OBJS)\baselib_dlmsw.obj \
         $(OBJS)\baselib_mimetype.obj \
+       $(OBJS)\baselib_power.obj \
         $(OBJS)\baselib_regconf.obj \
         $(OBJS)\baselib_registry.obj \
         $(OBJS)\baselib_snglinst.obj \
         $(OBJS)\baselib_regconf.obj \
         $(OBJS)\baselib_registry.obj \
         $(OBJS)\baselib_snglinst.obj \
@@ -604,17 +674,17 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
-NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_141)$(__DEBUGRUNTIME_136) /DWIN32 \
+NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_141)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_135_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
         $(OBJS)\netdll_version.res \
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
         $(OBJS)\netdll_version.res \
@@ -630,16 +700,17 @@ NETDLL_OBJECTS =  \
         $(OBJS)\netdll_url.obj \
         $(OBJS)\netdll_gsocket.obj \
         $(OBJS)\netdll_urlmsw.obj
         $(OBJS)\netdll_url.obj \
         $(OBJS)\netdll_gsocket.obj \
         $(OBJS)\netdll_urlmsw.obj
-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME_149) /DWIN32 \
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
-       $(____DEBUGRUNTIME_148_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  NETLIB_OBJECTS =  \
         $(OBJS)\netlib_dummy.obj \
         $(OBJS)\netlib_fs_inet.obj \
  NETLIB_OBJECTS =  \
         $(OBJS)\netlib_dummy.obj \
         $(OBJS)\netlib_fs_inet.obj \
@@ -654,17 +725,17 @@ NETLIB_OBJECTS =  \
         $(OBJS)\netlib_url.obj \
         $(OBJS)\netlib_gsocket.obj \
         $(OBJS)\netlib_urlmsw.obj
         $(OBJS)\netlib_url.obj \
         $(OBJS)\netlib_gsocket.obj \
         $(OBJS)\netlib_urlmsw.obj
-COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_168)$(__DEBUGRUNTIME_163) /DWIN32 \
+COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_168)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_162_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE \
+       /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
  COREDLL_OBJECTS =  \
         $(OBJS)\coredll_dummy.obj \
         $(OBJS)\coredll_version.res \
  COREDLL_OBJECTS =  \
         $(OBJS)\coredll_dummy.obj \
         $(OBJS)\coredll_version.res \
@@ -676,16 +747,17 @@ COREDLL_OBJECTS =  \
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME_176) /DWIN32 \
+CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
-       $(____DEBUGRUNTIME_175_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=0 $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  CORELIB_OBJECTS =  \
         $(OBJS)\corelib_dummy.obj \
         $(OBJS)\corelib_event.obj \
  CORELIB_OBJECTS =  \
         $(OBJS)\corelib_dummy.obj \
         $(OBJS)\corelib_event.obj \
@@ -696,136 +768,149 @@ CORELIB_OBJECTS =  \
         $(OBJS)\corelib_mslu.obj \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
         $(OBJS)\corelib_mslu.obj \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
-ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_195)$(__DEBUGRUNTIME_190) /DWIN32 \
+ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_195)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_189_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  ADVDLL_OBJECTS =  \
         $(OBJS)\advdll_dummy.obj \
         $(OBJS)\advdll_version.res \
         $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
  ADVDLL_OBJECTS =  \
         $(OBJS)\advdll_dummy.obj \
         $(OBJS)\advdll_version.res \
         $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME_203) /DWIN32 \
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
-       $(____DEBUGRUNTIME_202_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  ADVLIB_OBJECTS =  \
         $(OBJS)\advlib_dummy.obj \
         $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
  ADVLIB_OBJECTS =  \
         $(OBJS)\advlib_dummy.obj \
         $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
-MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_222)$(__DEBUGRUNTIME_217) /DWIN32 \
+MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_222)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_216_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_MEDIA \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
  MEDIADLL_OBJECTS =  \
         $(OBJS)\mediadll_dummy.obj \
         $(OBJS)\mediadll_version.res \
         $(OBJS)\mediadll_mediactrlcmn.obj \
  MEDIADLL_OBJECTS =  \
         $(OBJS)\mediadll_dummy.obj \
         $(OBJS)\mediadll_version.res \
         $(OBJS)\mediadll_mediactrlcmn.obj \
-       $(OBJS)\mediadll_mediactrl.obj
-MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME_230) /DWIN32 \
+       $(OBJS)\mediadll_mediactrl_am.obj \
+       $(OBJS)\mediadll_mediactrl_wmp10.obj \
+       $(OBJS)\mediadll_mediactrl_qt.obj \
+       $(OBJS)\mediadll_activex.obj
+MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
-       $(____DEBUGRUNTIME_229_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS)
  MEDIALIB_OBJECTS =  \
         $(OBJS)\medialib_dummy.obj \
         $(OBJS)\medialib_mediactrlcmn.obj \
  MEDIALIB_OBJECTS =  \
         $(OBJS)\medialib_dummy.obj \
         $(OBJS)\medialib_mediactrlcmn.obj \
-       $(OBJS)\medialib_mediactrl.obj
-ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_249)$(__DEBUGRUNTIME_244) /DWIN32 \
+       $(OBJS)\medialib_mediactrl_am.obj \
+       $(OBJS)\medialib_mediactrl_wmp10.obj \
+       $(OBJS)\medialib_mediactrl_qt.obj \
+       $(OBJS)\medialib_activex.obj
+ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_249)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_243_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_ODBC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_odbcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  ODBCDLL_OBJECTS =  \
         $(OBJS)\odbcdll_dummy.obj \
         $(OBJS)\odbcdll_version.res \
         $(OBJS)\odbcdll_db.obj \
         $(OBJS)\odbcdll_dbtable.obj
  ODBCDLL_OBJECTS =  \
         $(OBJS)\odbcdll_dummy.obj \
         $(OBJS)\odbcdll_version.res \
         $(OBJS)\odbcdll_db.obj \
         $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME_257) /DWIN32 \
+ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \
-       $(____DEBUGRUNTIME_256_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_odbclib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbclib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  ODBCLIB_OBJECTS =  \
         $(OBJS)\odbclib_dummy.obj \
         $(OBJS)\odbclib_db.obj \
         $(OBJS)\odbclib_dbtable.obj
  ODBCLIB_OBJECTS =  \
         $(OBJS)\odbclib_dummy.obj \
         $(OBJS)\odbclib_db.obj \
         $(OBJS)\odbclib_dbtable.obj
-DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_276)$(__DEBUGRUNTIME_271) /DWIN32 \
+DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_276)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_270_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_DBGRID \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_dbgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
  DBGRIDDLL_OBJECTS =  \
         $(OBJS)\dbgriddll_dummy.obj \
         $(OBJS)\dbgriddll_version.res \
         $(OBJS)\dbgriddll_dbgrid.obj
  DBGRIDDLL_OBJECTS =  \
         $(OBJS)\dbgriddll_dummy.obj \
         $(OBJS)\dbgriddll_version.res \
         $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME_284) /DWIN32 \
+DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.pdb \
-       $(____DEBUGRUNTIME_283_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_dbgridlib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgridlib.pch" $(CPPFLAGS) $(CXXFLAGS)
  DBGRIDLIB_OBJECTS =  \
         $(OBJS)\dbgridlib_dummy.obj \
         $(OBJS)\dbgridlib_dbgrid.obj
  DBGRIDLIB_OBJECTS =  \
         $(OBJS)\dbgridlib_dummy.obj \
         $(OBJS)\dbgridlib_dbgrid.obj
-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_303)$(__DEBUGRUNTIME_298) /DWIN32 \
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_303)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_297_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_dummy.obj \
         $(OBJS)\htmldll_version.res \
         $(OBJS)\htmldll_helpbest.obj \
         $(OBJS)\htmldll_helpctrl.obj \
         $(OBJS)\htmldll_helpdata.obj \
  HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_dummy.obj \
         $(OBJS)\htmldll_version.res \
         $(OBJS)\htmldll_helpbest.obj \
         $(OBJS)\htmldll_helpctrl.obj \
         $(OBJS)\htmldll_helpdata.obj \
+       $(OBJS)\htmldll_helpdlg.obj \
         $(OBJS)\htmldll_helpfrm.obj \
         $(OBJS)\htmldll_helpfrm.obj \
+       $(OBJS)\htmldll_helpwnd.obj \
         $(OBJS)\htmldll_htmlcell.obj \
         $(OBJS)\htmldll_htmlfilt.obj \
         $(OBJS)\htmldll_htmlpars.obj \
         $(OBJS)\htmldll_htmlcell.obj \
         $(OBJS)\htmldll_htmlfilt.obj \
         $(OBJS)\htmldll_htmlpars.obj \
@@ -844,22 +929,24 @@ HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_m_tables.obj \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
         $(OBJS)\htmldll_m_tables.obj \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME_311) /DWIN32 \
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
-       $(____DEBUGRUNTIME_310_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_dummy.obj \
         $(OBJS)\htmllib_helpbest.obj \
         $(OBJS)\htmllib_helpctrl.obj \
         $(OBJS)\htmllib_helpdata.obj \
  HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_dummy.obj \
         $(OBJS)\htmllib_helpbest.obj \
         $(OBJS)\htmllib_helpctrl.obj \
         $(OBJS)\htmllib_helpdata.obj \
+       $(OBJS)\htmllib_helpdlg.obj \
         $(OBJS)\htmllib_helpfrm.obj \
         $(OBJS)\htmllib_helpfrm.obj \
+       $(OBJS)\htmllib_helpwnd.obj \
         $(OBJS)\htmllib_htmlcell.obj \
         $(OBJS)\htmllib_htmlfilt.obj \
         $(OBJS)\htmllib_htmlpars.obj \
         $(OBJS)\htmllib_htmlcell.obj \
         $(OBJS)\htmllib_htmlfilt.obj \
         $(OBJS)\htmllib_htmlpars.obj \
@@ -878,104 +965,118 @@ HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
-QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_330)$(__DEBUGRUNTIME_325) /DWIN32 \
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_330)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_324_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_QA \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
  QADLL_OBJECTS =  \
         $(OBJS)\qadll_dummy.obj \
         $(OBJS)\qadll_version.res \
         $(OBJS)\qadll_debugrpt.obj \
         $(OBJS)\qadll_dbgrptg.obj
  QADLL_OBJECTS =  \
         $(OBJS)\qadll_dummy.obj \
         $(OBJS)\qadll_version.res \
         $(OBJS)\qadll_debugrpt.obj \
         $(OBJS)\qadll_dbgrptg.obj
-QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME_338) /DWIN32 \
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
-       $(____DEBUGRUNTIME_337_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_qalib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qalib.pch" $(CPPFLAGS) $(CXXFLAGS)
  QALIB_OBJECTS =  \
         $(OBJS)\qalib_dummy.obj \
         $(OBJS)\qalib_debugrpt.obj \
         $(OBJS)\qalib_dbgrptg.obj
  QALIB_OBJECTS =  \
         $(OBJS)\qalib_dummy.obj \
         $(OBJS)\qalib_debugrpt.obj \
         $(OBJS)\qalib_dbgrptg.obj
-XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_357)$(__DEBUGRUNTIME_352) /DWIN32 \
+XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_357)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_351_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
         $(OBJS)\xmldll_version.res \
         $(OBJS)\xmldll_xml.obj \
         $(OBJS)\xmldll_xtixml.obj
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
         $(OBJS)\xmldll_version.res \
         $(OBJS)\xmldll_xml.obj \
         $(OBJS)\xmldll_xtixml.obj
-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME_365) /DWIN32 \
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
-       $(____DEBUGRUNTIME_364_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
  XMLLIB_OBJECTS =  \
         $(OBJS)\xmllib_dummy.obj \
         $(OBJS)\xmllib_xml.obj \
         $(OBJS)\xmllib_xtixml.obj
  XMLLIB_OBJECTS =  \
         $(OBJS)\xmllib_dummy.obj \
         $(OBJS)\xmllib_xml.obj \
         $(OBJS)\xmllib_xtixml.obj
-XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_384)$(__DEBUGRUNTIME_379) /DWIN32 \
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_384)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_378_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XRC \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_dummy.obj \
         $(OBJS)\xrcdll_version.res \
  XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_dummy.obj \
         $(OBJS)\xrcdll_version.res \
-       $(OBJS)\xrcdll_xh_bmpbt.obj \
+       $(OBJS)\xrcdll_xh_animatctrl.obj \
         $(OBJS)\xrcdll_xh_bmp.obj \
         $(OBJS)\xrcdll_xh_bmp.obj \
+       $(OBJS)\xrcdll_xh_bmpcbox.obj \
+       $(OBJS)\xrcdll_xh_bmpbt.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_choicbk.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_choicbk.obj \
+       $(OBJS)\xrcdll_xh_clrpicker.obj \
+       $(OBJS)\xrcdll_xh_collpane.obj \
         $(OBJS)\xrcdll_xh_combo.obj \
         $(OBJS)\xrcdll_xh_datectrl.obj \
         $(OBJS)\xrcdll_xh_combo.obj \
         $(OBJS)\xrcdll_xh_datectrl.obj \
+       $(OBJS)\xrcdll_xh_dirpicker.obj \
         $(OBJS)\xrcdll_xh_dlg.obj \
         $(OBJS)\xrcdll_xh_frame.obj \
         $(OBJS)\xrcdll_xh_mdi.obj \
         $(OBJS)\xrcdll_xh_dlg.obj \
         $(OBJS)\xrcdll_xh_frame.obj \
         $(OBJS)\xrcdll_xh_mdi.obj \
+       $(OBJS)\xrcdll_xh_filepicker.obj \
+       $(OBJS)\xrcdll_xh_fontpicker.obj \
         $(OBJS)\xrcdll_xh_gauge.obj \
         $(OBJS)\xrcdll_xh_gdctl.obj \
         $(OBJS)\xrcdll_xh_gauge.obj \
         $(OBJS)\xrcdll_xh_gdctl.obj \
+       $(OBJS)\xrcdll_xh_grid.obj \
         $(OBJS)\xrcdll_xh_html.obj \
         $(OBJS)\xrcdll_xh_html.obj \
+       $(OBJS)\xrcdll_xh_hyperlink.obj \
         $(OBJS)\xrcdll_xh_listb.obj \
         $(OBJS)\xrcdll_xh_listbk.obj \
         $(OBJS)\xrcdll_xh_listc.obj \
         $(OBJS)\xrcdll_xh_menu.obj \
         $(OBJS)\xrcdll_xh_notbk.obj \
         $(OBJS)\xrcdll_xh_listb.obj \
         $(OBJS)\xrcdll_xh_listbk.obj \
         $(OBJS)\xrcdll_xh_listc.obj \
         $(OBJS)\xrcdll_xh_menu.obj \
         $(OBJS)\xrcdll_xh_notbk.obj \
+       $(OBJS)\xrcdll_xh_odcombo.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_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_htmllbox.obj \
         $(OBJS)\xrcdll_xh_sizer.obj \
         $(OBJS)\xrcdll_xh_slidr.obj \
         $(OBJS)\xrcdll_xh_spin.obj \
         $(OBJS)\xrcdll_xh_sizer.obj \
         $(OBJS)\xrcdll_xh_slidr.obj \
         $(OBJS)\xrcdll_xh_spin.obj \
@@ -989,48 +1090,60 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_tglbtn.obj \
         $(OBJS)\xrcdll_xh_toolb.obj \
         $(OBJS)\xrcdll_xh_tree.obj \
         $(OBJS)\xrcdll_xh_tglbtn.obj \
         $(OBJS)\xrcdll_xh_toolb.obj \
         $(OBJS)\xrcdll_xh_tree.obj \
+       $(OBJS)\xrcdll_xh_treebk.obj \
         $(OBJS)\xrcdll_xh_unkwn.obj \
         $(OBJS)\xrcdll_xh_wizrd.obj \
         $(OBJS)\xrcdll_xmlres.obj \
         $(OBJS)\xrcdll_xmlrsall.obj
         $(OBJS)\xrcdll_xh_unkwn.obj \
         $(OBJS)\xrcdll_xh_wizrd.obj \
         $(OBJS)\xrcdll_xmlres.obj \
         $(OBJS)\xrcdll_xmlrsall.obj
-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME_392) /DWIN32 \
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
-       $(____DEBUGRUNTIME_391_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
  XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_dummy.obj \
  XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_dummy.obj \
-       $(OBJS)\xrclib_xh_bmpbt.obj \
+       $(OBJS)\xrclib_xh_animatctrl.obj \
         $(OBJS)\xrclib_xh_bmp.obj \
         $(OBJS)\xrclib_xh_bmp.obj \
+       $(OBJS)\xrclib_xh_bmpcbox.obj \
+       $(OBJS)\xrclib_xh_bmpbt.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_choicbk.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_choicbk.obj \
+       $(OBJS)\xrclib_xh_clrpicker.obj \
+       $(OBJS)\xrclib_xh_collpane.obj \
         $(OBJS)\xrclib_xh_combo.obj \
         $(OBJS)\xrclib_xh_datectrl.obj \
         $(OBJS)\xrclib_xh_combo.obj \
         $(OBJS)\xrclib_xh_datectrl.obj \
+       $(OBJS)\xrclib_xh_dirpicker.obj \
         $(OBJS)\xrclib_xh_dlg.obj \
         $(OBJS)\xrclib_xh_frame.obj \
         $(OBJS)\xrclib_xh_mdi.obj \
         $(OBJS)\xrclib_xh_dlg.obj \
         $(OBJS)\xrclib_xh_frame.obj \
         $(OBJS)\xrclib_xh_mdi.obj \
+       $(OBJS)\xrclib_xh_filepicker.obj \
+       $(OBJS)\xrclib_xh_fontpicker.obj \
         $(OBJS)\xrclib_xh_gauge.obj \
         $(OBJS)\xrclib_xh_gdctl.obj \
         $(OBJS)\xrclib_xh_gauge.obj \
         $(OBJS)\xrclib_xh_gdctl.obj \
+       $(OBJS)\xrclib_xh_grid.obj \
         $(OBJS)\xrclib_xh_html.obj \
         $(OBJS)\xrclib_xh_html.obj \
+       $(OBJS)\xrclib_xh_hyperlink.obj \
         $(OBJS)\xrclib_xh_listb.obj \
         $(OBJS)\xrclib_xh_listbk.obj \
         $(OBJS)\xrclib_xh_listc.obj \
         $(OBJS)\xrclib_xh_menu.obj \
         $(OBJS)\xrclib_xh_notbk.obj \
         $(OBJS)\xrclib_xh_listb.obj \
         $(OBJS)\xrclib_xh_listbk.obj \
         $(OBJS)\xrclib_xh_listc.obj \
         $(OBJS)\xrclib_xh_menu.obj \
         $(OBJS)\xrclib_xh_notbk.obj \
+       $(OBJS)\xrclib_xh_odcombo.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_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_htmllbox.obj \
         $(OBJS)\xrclib_xh_sizer.obj \
         $(OBJS)\xrclib_xh_slidr.obj \
         $(OBJS)\xrclib_xh_spin.obj \
         $(OBJS)\xrclib_xh_sizer.obj \
         $(OBJS)\xrclib_xh_slidr.obj \
         $(OBJS)\xrclib_xh_spin.obj \
@@ -1044,34 +1157,117 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_tglbtn.obj \
         $(OBJS)\xrclib_xh_toolb.obj \
         $(OBJS)\xrclib_xh_tree.obj \
         $(OBJS)\xrclib_xh_tglbtn.obj \
         $(OBJS)\xrclib_xh_toolb.obj \
         $(OBJS)\xrclib_xh_tree.obj \
+       $(OBJS)\xrclib_xh_treebk.obj \
         $(OBJS)\xrclib_xh_unkwn.obj \
         $(OBJS)\xrclib_xh_wizrd.obj \
         $(OBJS)\xrclib_xmlres.obj \
         $(OBJS)\xrclib_xmlrsall.obj
         $(OBJS)\xrclib_xh_unkwn.obj \
         $(OBJS)\xrclib_xh_wizrd.obj \
         $(OBJS)\xrclib_xmlres.obj \
         $(OBJS)\xrclib_xmlrsall.obj
-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_411)$(__DEBUGRUNTIME_406) /DWIN32 \
+AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_411)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_AUI \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
+AUIDLL_OBJECTS =  \
+       $(OBJS)\auidll_dummy.obj \
+       $(OBJS)\auidll_version.res \
+       $(OBJS)\auidll_framemanager.obj \
+       $(OBJS)\auidll_dockart.obj \
+       $(OBJS)\auidll_floatpane.obj \
+       $(OBJS)\auidll_auibook.obj \
+       $(OBJS)\auidll_tabmdi.obj
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auilib.pch" $(CPPFLAGS) $(CXXFLAGS)
+AUILIB_OBJECTS =  \
+       $(OBJS)\auilib_dummy.obj \
+       $(OBJS)\auilib_framemanager.obj \
+       $(OBJS)\auilib_dockart.obj \
+       $(OBJS)\auilib_floatpane.obj \
+       $(OBJS)\auilib_auibook.obj \
+       $(OBJS)\auilib_tabmdi.obj
+RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_438)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RICHTEXT \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
+RICHTEXTDLL_OBJECTS =  \
+       $(OBJS)\richtextdll_dummy.obj \
+       $(OBJS)\richtextdll_version.res \
+       $(OBJS)\richtextdll_richtextctrl.obj \
+       $(OBJS)\richtextdll_richtextbuffer.obj \
+       $(OBJS)\richtextdll_richtextstyles.obj \
+       $(OBJS)\richtextdll_richtextxml.obj \
+       $(OBJS)\richtextdll_richtexthtml.obj \
+       $(OBJS)\richtextdll_richtextformatdlg.obj \
+       $(OBJS)\richtextdll_richtextsymboldlg.obj \
+       $(OBJS)\richtextdll_richtextstyledlg.obj \
+       $(OBJS)\richtextdll_richtextprint.obj
+RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextlib.pch" $(CPPFLAGS) \
+       $(CXXFLAGS)
+RICHTEXTLIB_OBJECTS =  \
+       $(OBJS)\richtextlib_dummy.obj \
+       $(OBJS)\richtextlib_richtextctrl.obj \
+       $(OBJS)\richtextlib_richtextbuffer.obj \
+       $(OBJS)\richtextlib_richtextstyles.obj \
+       $(OBJS)\richtextlib_richtextxml.obj \
+       $(OBJS)\richtextlib_richtexthtml.obj \
+       $(OBJS)\richtextlib_richtextformatdlg.obj \
+       $(OBJS)\richtextlib_richtextsymboldlg.obj \
+       $(OBJS)\richtextlib_richtextstyledlg.obj \
+       $(OBJS)\richtextlib_richtextprint.obj
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_465)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_405_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  GLDLL_OBJECTS =  \
         $(OBJS)\gldll_dummy.obj \
         $(OBJS)\gldll_version.res \
         $(OBJS)\gldll_glcanvas.obj
  GLDLL_OBJECTS =  \
         $(OBJS)\gldll_dummy.obj \
         $(OBJS)\gldll_version.res \
         $(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME_419) /DWIN32 \
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_478)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
-       $(____DEBUGRUNTIME_418_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
         $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
         $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \
-       /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
+       /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS)
  GLLIB_OBJECTS =  \
         $(OBJS)\gllib_dummy.obj \
         $(OBJS)\gllib_glcanvas.obj
  GLLIB_OBJECTS =  \
         $(OBJS)\gllib_dummy.obj \
         $(OBJS)\gllib_glcanvas.obj
@@ -1103,6 +1299,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -1112,23 +1320,17 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 = 
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = $(__DEBUGINFO_34)
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_8 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_8 = D
@@ -1136,24 +1338,6 @@ __RUNTIME_LIBS_8 = D
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_8 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_8 = $(__THREADSFLAG)
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_15_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_15_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_15_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_16 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_16 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_16 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_21 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_21 = D
  !endif
@@ -1163,24 +1347,6 @@ __RUNTIME_LIBS_21 = $(__THREADSFLAG)
  !if "$(USE_GUI)" == "1"
  __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
  !endif
  !if "$(USE_GUI)" == "1"
  __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_28_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_28_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_28_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_29 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_29 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_29 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_34 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_34 = D
  !endif
@@ -1190,24 +1356,6 @@ __RUNTIME_LIBS_34 = $(__THREADSFLAG)
  !if "$(USE_GUI)" == "1"
  __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
  !endif
  !if "$(USE_GUI)" == "1"
  __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_41_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_41_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_41_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_42 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_42 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_42 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_47 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_47 = D
  !endif
@@ -1217,48 +1365,12 @@ __RUNTIME_LIBS_47 = $(__THREADSFLAG)
  !if "$(USE_GUI)" == "1"
  __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
  !endif
  !if "$(USE_GUI)" == "1"
  __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_54_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_54_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_54_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_55 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_55 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_55 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_60 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_60 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_60 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_60 = $(__THREADSFLAG)
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_67_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_67_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_67_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_68 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_68 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_68 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_73 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_73 = D
  !endif
@@ -1275,33 +1387,6 @@ EXTRALIBS_FOR_BASE =
  __monodll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  __monodll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_81_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_81_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_81_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_81_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_81_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_81_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_82 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_82 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_82 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_87 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_87 = D
  !endif
@@ -1313,11 +1398,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_OBJECTS) \
         $(____ADVANCED_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_mediactrlcmn.obj \
         $(____CORE_SRC_FILENAMES_OBJECTS) \
         $(____ADVANCED_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_mediactrlcmn.obj \
-       $(OBJS)\monodll_mediactrl.obj \
+       $(OBJS)\monodll_mediactrl_am.obj \
+       $(OBJS)\monodll_mediactrl_wmp10.obj \
+       $(OBJS)\monodll_mediactrl_qt.obj \
+       $(OBJS)\monodll_activex.obj \
         $(OBJS)\monodll_helpbest.obj \
         $(OBJS)\monodll_helpctrl.obj \
         $(OBJS)\monodll_helpdata.obj \
         $(OBJS)\monodll_helpbest.obj \
         $(OBJS)\monodll_helpctrl.obj \
         $(OBJS)\monodll_helpdata.obj \
+       $(OBJS)\monodll_helpdlg.obj \
         $(OBJS)\monodll_helpfrm.obj \
         $(OBJS)\monodll_helpfrm.obj \
+       $(OBJS)\monodll_helpwnd.obj \
         $(OBJS)\monodll_htmlcell.obj \
         $(OBJS)\monodll_htmlfilt.obj \
         $(OBJS)\monodll_htmlpars.obj \
         $(OBJS)\monodll_htmlcell.obj \
         $(OBJS)\monodll_htmlfilt.obj \
         $(OBJS)\monodll_htmlpars.obj \
@@ -1341,32 +1431,43 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_debugrpt.obj \
         $(OBJS)\monodll_dbgrptg.obj \
         $(OBJS)\monodll_dbgrid.obj \
         $(OBJS)\monodll_debugrpt.obj \
         $(OBJS)\monodll_dbgrptg.obj \
         $(OBJS)\monodll_dbgrid.obj \
-       $(OBJS)\monodll_xh_bmpbt.obj \
+       $(OBJS)\monodll_xh_animatctrl.obj \
         $(OBJS)\monodll_xh_bmp.obj \
         $(OBJS)\monodll_xh_bmp.obj \
+       $(OBJS)\monodll_xh_bmpcbox.obj \
+       $(OBJS)\monodll_xh_bmpbt.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_choicbk.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_choicbk.obj \
+       $(OBJS)\monodll_xh_clrpicker.obj \
+       $(OBJS)\monodll_xh_collpane.obj \
         $(OBJS)\monodll_xh_combo.obj \
         $(OBJS)\monodll_xh_datectrl.obj \
         $(OBJS)\monodll_xh_combo.obj \
         $(OBJS)\monodll_xh_datectrl.obj \
+       $(OBJS)\monodll_xh_dirpicker.obj \
         $(OBJS)\monodll_xh_dlg.obj \
         $(OBJS)\monodll_xh_frame.obj \
         $(OBJS)\monodll_xh_mdi.obj \
         $(OBJS)\monodll_xh_dlg.obj \
         $(OBJS)\monodll_xh_frame.obj \
         $(OBJS)\monodll_xh_mdi.obj \
+       $(OBJS)\monodll_xh_filepicker.obj \
+       $(OBJS)\monodll_xh_fontpicker.obj \
         $(OBJS)\monodll_xh_gauge.obj \
         $(OBJS)\monodll_xh_gdctl.obj \
         $(OBJS)\monodll_xh_gauge.obj \
         $(OBJS)\monodll_xh_gdctl.obj \
+       $(OBJS)\monodll_xh_grid.obj \
         $(OBJS)\monodll_xh_html.obj \
         $(OBJS)\monodll_xh_html.obj \
+       $(OBJS)\monodll_xh_hyperlink.obj \
         $(OBJS)\monodll_xh_listb.obj \
         $(OBJS)\monodll_xh_listbk.obj \
         $(OBJS)\monodll_xh_listc.obj \
         $(OBJS)\monodll_xh_menu.obj \
         $(OBJS)\monodll_xh_notbk.obj \
         $(OBJS)\monodll_xh_listb.obj \
         $(OBJS)\monodll_xh_listbk.obj \
         $(OBJS)\monodll_xh_listc.obj \
         $(OBJS)\monodll_xh_menu.obj \
         $(OBJS)\monodll_xh_notbk.obj \
+       $(OBJS)\monodll_xh_odcombo.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_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_htmllbox.obj \
         $(OBJS)\monodll_xh_sizer.obj \
         $(OBJS)\monodll_xh_slidr.obj \
         $(OBJS)\monodll_xh_spin.obj \
         $(OBJS)\monodll_xh_sizer.obj \
         $(OBJS)\monodll_xh_slidr.obj \
         $(OBJS)\monodll_xh_spin.obj \
@@ -1380,10 +1481,25 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_tglbtn.obj \
         $(OBJS)\monodll_xh_toolb.obj \
         $(OBJS)\monodll_xh_tree.obj \
         $(OBJS)\monodll_xh_tglbtn.obj \
         $(OBJS)\monodll_xh_toolb.obj \
         $(OBJS)\monodll_xh_tree.obj \
+       $(OBJS)\monodll_xh_treebk.obj \
         $(OBJS)\monodll_xh_unkwn.obj \
         $(OBJS)\monodll_xh_wizrd.obj \
         $(OBJS)\monodll_xmlres.obj \
         $(OBJS)\monodll_xh_unkwn.obj \
         $(OBJS)\monodll_xh_wizrd.obj \
         $(OBJS)\monodll_xmlres.obj \
-       $(OBJS)\monodll_xmlrsall.obj
+       $(OBJS)\monodll_xmlrsall.obj \
+       $(OBJS)\monodll_framemanager.obj \
+       $(OBJS)\monodll_dockart.obj \
+       $(OBJS)\monodll_floatpane.obj \
+       $(OBJS)\monodll_auibook.obj \
+       $(OBJS)\monodll_tabmdi.obj \
+       $(OBJS)\monodll_richtextctrl.obj \
+       $(OBJS)\monodll_richtextbuffer.obj \
+       $(OBJS)\monodll_richtextstyles.obj \
+       $(OBJS)\monodll_richtextxml.obj \
+       $(OBJS)\monodll_richtexthtml.obj \
+       $(OBJS)\monodll_richtextformatdlg.obj \
+       $(OBJS)\monodll_richtextsymboldlg.obj \
+       $(OBJS)\monodll_richtextstyledlg.obj \
+       $(OBJS)\monodll_richtextprint.obj
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -1410,8 +1526,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontutil.obj \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
         $(OBJS)\monodll_fontutil.obj \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
+       $(OBJS)\monodll_gdiplus.obj \
+       $(OBJS)\monodll_graphics.obj \
         $(OBJS)\monodll_gsockmsw.obj \
         $(OBJS)\monodll_icon.obj \
         $(OBJS)\monodll_gsockmsw.obj \
         $(OBJS)\monodll_icon.obj \
+       $(OBJS)\monodll_imaglist.obj \
         $(OBJS)\monodll_minifram.obj \
         $(OBJS)\monodll_dataobj.obj \
         $(OBJS)\monodll_dropsrc.obj \
         $(OBJS)\monodll_minifram.obj \
         $(OBJS)\monodll_dataobj.obj \
         $(OBJS)\monodll_dropsrc.obj \
@@ -1441,9 +1560,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_bmpbuttn.obj \
         $(OBJS)\monodll_button.obj \
         $(OBJS)\monodll_checkbox.obj \
         $(OBJS)\monodll_bmpbuttn.obj \
         $(OBJS)\monodll_button.obj \
         $(OBJS)\monodll_checkbox.obj \
-       $(OBJS)\monodll_checklst.obj \
         $(OBJS)\monodll_choice.obj \
         $(OBJS)\monodll_colordlg.obj \
         $(OBJS)\monodll_choice.obj \
         $(OBJS)\monodll_colordlg.obj \
+       $(OBJS)\monodll_combo.obj \
         $(OBJS)\monodll_combobox.obj \
         $(OBJS)\monodll_control.obj \
         $(OBJS)\monodll_dialog.obj \
         $(OBJS)\monodll_combobox.obj \
         $(OBJS)\monodll_control.obj \
         $(OBJS)\monodll_dialog.obj \
@@ -1452,7 +1571,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_filedlg.obj \
         $(OBJS)\monodll_frame.obj \
         $(OBJS)\monodll_gauge95.obj \
         $(OBJS)\monodll_filedlg.obj \
         $(OBJS)\monodll_frame.obj \
         $(OBJS)\monodll_gauge95.obj \
-       $(OBJS)\monodll_imaglist.obj \
         $(OBJS)\monodll_iniconf.obj \
         $(OBJS)\monodll_listbox.obj \
         $(OBJS)\monodll_listctrl.obj \
         $(OBJS)\monodll_iniconf.obj \
         $(OBJS)\monodll_listbox.obj \
         $(OBJS)\monodll_listctrl.obj \
@@ -1481,9 +1599,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_tglbtn.obj \
         $(OBJS)\monodll_treectrl.obj \
         $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_tglbtn.obj \
         $(OBJS)\monodll_treectrl.obj \
+       $(OBJS)\monodll_checklst.obj \
         $(OBJS)\monodll_fdrepdlg.obj \
         $(OBJS)\monodll_fontdlg.obj \
         $(OBJS)\monodll_accesscmn.obj \
         $(OBJS)\monodll_fdrepdlg.obj \
         $(OBJS)\monodll_fontdlg.obj \
         $(OBJS)\monodll_accesscmn.obj \
+       $(OBJS)\monodll_anidecod.obj \
         $(OBJS)\monodll_appcmn.obj \
         $(OBJS)\monodll_artprov.obj \
         $(OBJS)\monodll_artstd.obj \
         $(OBJS)\monodll_appcmn.obj \
         $(OBJS)\monodll_artprov.obj \
         $(OBJS)\monodll_artstd.obj \
@@ -1491,6 +1611,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_bookctrl.obj \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
         $(OBJS)\monodll_bookctrl.obj \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
+       $(OBJS)\monodll_clrpickercmn.obj \
+       $(OBJS)\monodll_colourcmn.obj \
+       $(OBJS)\monodll_combocmn.obj \
         $(OBJS)\monodll_cmdproc.obj \
         $(OBJS)\monodll_cmndata.obj \
         $(OBJS)\monodll_containr.obj \
         $(OBJS)\monodll_cmdproc.obj \
         $(OBJS)\monodll_cmndata.obj \
         $(OBJS)\monodll_containr.obj \
@@ -1499,6 +1622,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_ctrlsub.obj \
         $(OBJS)\monodll_datacmn.obj \
         $(OBJS)\monodll_dcbase.obj \
         $(OBJS)\monodll_ctrlsub.obj \
         $(OBJS)\monodll_datacmn.obj \
         $(OBJS)\monodll_dcbase.obj \
+       $(OBJS)\monodll_dcbufcmn.obj \
+       $(OBJS)\monodll_dcgraph.obj \
         $(OBJS)\monodll_dlgcmn.obj \
         $(OBJS)\monodll_dndcmn.obj \
         $(OBJS)\monodll_dobjcmn.obj \
         $(OBJS)\monodll_dlgcmn.obj \
         $(OBJS)\monodll_dndcmn.obj \
         $(OBJS)\monodll_dobjcmn.obj \
@@ -1507,16 +1632,22 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dpycmn.obj \
         $(OBJS)\monodll_dseldlg.obj \
         $(OBJS)\monodll_effects.obj \
         $(OBJS)\monodll_dpycmn.obj \
         $(OBJS)\monodll_dseldlg.obj \
         $(OBJS)\monodll_effects.obj \
+       $(OBJS)\monodll_evtloopcmn.obj \
         $(OBJS)\monodll_fddlgcmn.obj \
         $(OBJS)\monodll_fddlgcmn.obj \
+       $(OBJS)\monodll_filepickercmn.obj \
+       $(OBJS)\monodll_fontpickercmn.obj \
         $(OBJS)\monodll_fldlgcmn.obj \
         $(OBJS)\monodll_fontcmn.obj \
         $(OBJS)\monodll_fldlgcmn.obj \
         $(OBJS)\monodll_fontcmn.obj \
+       $(OBJS)\monodll_fontenumcmn.obj \
         $(OBJS)\monodll_fontmap.obj \
         $(OBJS)\monodll_fontmap.obj \
+       $(OBJS)\monodll_fontutilcmn.obj \
         $(OBJS)\monodll_framecmn.obj \
         $(OBJS)\monodll_gaugecmn.obj \
         $(OBJS)\monodll_gbsizer.obj \
         $(OBJS)\monodll_gdicmn.obj \
         $(OBJS)\monodll_geometry.obj \
         $(OBJS)\monodll_gifdecod.obj \
         $(OBJS)\monodll_framecmn.obj \
         $(OBJS)\monodll_gaugecmn.obj \
         $(OBJS)\monodll_gbsizer.obj \
         $(OBJS)\monodll_gdicmn.obj \
         $(OBJS)\monodll_geometry.obj \
         $(OBJS)\monodll_gifdecod.obj \
+       $(OBJS)\monodll_graphcmn.obj \
         $(OBJS)\monodll_helpbase.obj \
         $(OBJS)\monodll_iconbndl.obj \
         $(OBJS)\monodll_imagall.obj \
         $(OBJS)\monodll_helpbase.obj \
         $(OBJS)\monodll_iconbndl.obj \
         $(OBJS)\monodll_imagall.obj \
@@ -1529,14 +1660,18 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_imagpcx.obj \
         $(OBJS)\monodll_imagpng.obj \
         $(OBJS)\monodll_imagpnm.obj \
         $(OBJS)\monodll_imagpcx.obj \
         $(OBJS)\monodll_imagpng.obj \
         $(OBJS)\monodll_imagpnm.obj \
+       $(OBJS)\monodll_imagtga.obj \
         $(OBJS)\monodll_imagtiff.obj \
         $(OBJS)\monodll_imagxpm.obj \
         $(OBJS)\monodll_layout.obj \
         $(OBJS)\monodll_lboxcmn.obj \
         $(OBJS)\monodll_imagtiff.obj \
         $(OBJS)\monodll_imagxpm.obj \
         $(OBJS)\monodll_layout.obj \
         $(OBJS)\monodll_lboxcmn.obj \
+       $(OBJS)\monodll_listctrlcmn.obj \
         $(OBJS)\monodll_matrix.obj \
         $(OBJS)\monodll_menucmn.obj \
         $(OBJS)\monodll_nbkbase.obj \
         $(OBJS)\monodll_matrix.obj \
         $(OBJS)\monodll_menucmn.obj \
         $(OBJS)\monodll_nbkbase.obj \
+       $(OBJS)\monodll_overlaycmn.obj \
         $(OBJS)\monodll_paper.obj \
         $(OBJS)\monodll_paper.obj \
+       $(OBJS)\monodll_pickerbase.obj \
         $(OBJS)\monodll_popupcmn.obj \
         $(OBJS)\monodll_prntbase.obj \
         $(OBJS)\monodll_quantize.obj \
         $(OBJS)\monodll_popupcmn.obj \
         $(OBJS)\monodll_prntbase.obj \
         $(OBJS)\monodll_quantize.obj \
@@ -1545,6 +1680,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_rgncmn.obj \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
         $(OBJS)\monodll_rgncmn.obj \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
+       $(OBJS)\monodll_srchcmn.obj \
         $(OBJS)\monodll_statbar.obj \
         $(OBJS)\monodll_stockitem.obj \
         $(OBJS)\monodll_tbarbase.obj \
         $(OBJS)\monodll_statbar.obj \
         $(OBJS)\monodll_stockitem.obj \
         $(OBJS)\monodll_tbarbase.obj \
@@ -1558,11 +1694,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_buttonbar.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
+       $(OBJS)\monodll_clrpickerg.obj \
+       $(OBJS)\monodll_collpaneg.obj \
+       $(OBJS)\monodll_combog.obj \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_fontpickerg.obj \
         $(OBJS)\monodll_listbkg.obj \
         $(OBJS)\monodll_logg.obj \
         $(OBJS)\monodll_numdlgg.obj \
         $(OBJS)\monodll_listbkg.obj \
         $(OBJS)\monodll_logg.obj \
         $(OBJS)\monodll_numdlgg.obj \
@@ -1574,9 +1716,12 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_selstore.obj \
         $(OBJS)\monodll_spinctlg.obj \
         $(OBJS)\monodll_splitter.obj \
         $(OBJS)\monodll_selstore.obj \
         $(OBJS)\monodll_spinctlg.obj \
         $(OBJS)\monodll_splitter.obj \
+       $(OBJS)\monodll_srchctlg.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_toolbkg.obj \
         $(OBJS)\monodll_treectlg.obj \
         $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_treebkg.obj \
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
@@ -1605,8 +1750,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontutil.obj \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
         $(OBJS)\monodll_fontutil.obj \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
+       $(OBJS)\monodll_gdiplus.obj \
+       $(OBJS)\monodll_graphics.obj \
         $(OBJS)\monodll_gsockmsw.obj \
         $(OBJS)\monodll_icon.obj \
         $(OBJS)\monodll_gsockmsw.obj \
         $(OBJS)\monodll_icon.obj \
+       $(OBJS)\monodll_imaglist.obj \
         $(OBJS)\monodll_minifram.obj \
         $(OBJS)\monodll_dataobj.obj \
         $(OBJS)\monodll_dropsrc.obj \
         $(OBJS)\monodll_minifram.obj \
         $(OBJS)\monodll_dataobj.obj \
         $(OBJS)\monodll_dropsrc.obj \
@@ -1636,7 +1784,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fdrepdlg.obj \
         $(OBJS)\monodll_filedlgg.obj \
         $(OBJS)\monodll_fontdlgg.obj \
         $(OBJS)\monodll_fdrepdlg.obj \
         $(OBJS)\monodll_filedlgg.obj \
         $(OBJS)\monodll_fontdlgg.obj \
-       $(OBJS)\monodll_imaglist.obj \
         $(OBJS)\monodll_listctrl.obj \
         $(OBJS)\monodll_mdig.obj \
         $(OBJS)\monodll_msgdlgg.obj \
         $(OBJS)\monodll_listctrl.obj \
         $(OBJS)\monodll_mdig.obj \
         $(OBJS)\monodll_msgdlgg.obj \
@@ -1671,15 +1818,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_statline.obj \
         $(OBJS)\monodll_stattext.obj \
         $(OBJS)\monodll_statusbr.obj \
         $(OBJS)\monodll_statline.obj \
         $(OBJS)\monodll_stattext.obj \
         $(OBJS)\monodll_statusbr.obj \
+       $(OBJS)\monodll_stdrend.obj \
         $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_textctrl.obj \
+       $(OBJS)\monodll_tglbtn.obj \
         $(OBJS)\monodll_theme.obj \
         $(OBJS)\monodll_toolbar.obj \
         $(OBJS)\monodll_topluniv.obj \
         $(OBJS)\monodll_winuniv.obj \
         $(OBJS)\monodll_gtk.obj \
         $(OBJS)\monodll_metal.obj \
         $(OBJS)\monodll_theme.obj \
         $(OBJS)\monodll_toolbar.obj \
         $(OBJS)\monodll_topluniv.obj \
         $(OBJS)\monodll_winuniv.obj \
         $(OBJS)\monodll_gtk.obj \
         $(OBJS)\monodll_metal.obj \
+       $(OBJS)\monodll_mono.obj \
         $(OBJS)\monodll_win32.obj \
         $(OBJS)\monodll_accesscmn.obj \
         $(OBJS)\monodll_win32.obj \
         $(OBJS)\monodll_accesscmn.obj \
+       $(OBJS)\monodll_anidecod.obj \
         $(OBJS)\monodll_appcmn.obj \
         $(OBJS)\monodll_artprov.obj \
         $(OBJS)\monodll_artstd.obj \
         $(OBJS)\monodll_appcmn.obj \
         $(OBJS)\monodll_artprov.obj \
         $(OBJS)\monodll_artstd.obj \
@@ -1687,6 +1838,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_bookctrl.obj \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
         $(OBJS)\monodll_bookctrl.obj \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
+       $(OBJS)\monodll_clrpickercmn.obj \
+       $(OBJS)\monodll_colourcmn.obj \
+       $(OBJS)\monodll_combocmn.obj \
         $(OBJS)\monodll_cmdproc.obj \
         $(OBJS)\monodll_cmndata.obj \
         $(OBJS)\monodll_containr.obj \
         $(OBJS)\monodll_cmdproc.obj \
         $(OBJS)\monodll_cmndata.obj \
         $(OBJS)\monodll_containr.obj \
@@ -1695,6 +1849,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_ctrlsub.obj \
         $(OBJS)\monodll_datacmn.obj \
         $(OBJS)\monodll_dcbase.obj \
         $(OBJS)\monodll_ctrlsub.obj \
         $(OBJS)\monodll_datacmn.obj \
         $(OBJS)\monodll_dcbase.obj \
+       $(OBJS)\monodll_dcbufcmn.obj \
+       $(OBJS)\monodll_dcgraph.obj \
         $(OBJS)\monodll_dlgcmn.obj \
         $(OBJS)\monodll_dndcmn.obj \
         $(OBJS)\monodll_dobjcmn.obj \
         $(OBJS)\monodll_dlgcmn.obj \
         $(OBJS)\monodll_dndcmn.obj \
         $(OBJS)\monodll_dobjcmn.obj \
@@ -1703,16 +1859,22 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dpycmn.obj \
         $(OBJS)\monodll_dseldlg.obj \
         $(OBJS)\monodll_effects.obj \
         $(OBJS)\monodll_dpycmn.obj \
         $(OBJS)\monodll_dseldlg.obj \
         $(OBJS)\monodll_effects.obj \
+       $(OBJS)\monodll_evtloopcmn.obj \
         $(OBJS)\monodll_fddlgcmn.obj \
         $(OBJS)\monodll_fddlgcmn.obj \
+       $(OBJS)\monodll_filepickercmn.obj \
+       $(OBJS)\monodll_fontpickercmn.obj \
         $(OBJS)\monodll_fldlgcmn.obj \
         $(OBJS)\monodll_fontcmn.obj \
         $(OBJS)\monodll_fldlgcmn.obj \
         $(OBJS)\monodll_fontcmn.obj \
+       $(OBJS)\monodll_fontenumcmn.obj \
         $(OBJS)\monodll_fontmap.obj \
         $(OBJS)\monodll_fontmap.obj \
+       $(OBJS)\monodll_fontutilcmn.obj \
         $(OBJS)\monodll_framecmn.obj \
         $(OBJS)\monodll_gaugecmn.obj \
         $(OBJS)\monodll_gbsizer.obj \
         $(OBJS)\monodll_gdicmn.obj \
         $(OBJS)\monodll_geometry.obj \
         $(OBJS)\monodll_gifdecod.obj \
         $(OBJS)\monodll_framecmn.obj \
         $(OBJS)\monodll_gaugecmn.obj \
         $(OBJS)\monodll_gbsizer.obj \
         $(OBJS)\monodll_gdicmn.obj \
         $(OBJS)\monodll_geometry.obj \
         $(OBJS)\monodll_gifdecod.obj \
+       $(OBJS)\monodll_graphcmn.obj \
         $(OBJS)\monodll_helpbase.obj \
         $(OBJS)\monodll_iconbndl.obj \
         $(OBJS)\monodll_imagall.obj \
         $(OBJS)\monodll_helpbase.obj \
         $(OBJS)\monodll_iconbndl.obj \
         $(OBJS)\monodll_imagall.obj \
@@ -1725,14 +1887,18 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_imagpcx.obj \
         $(OBJS)\monodll_imagpng.obj \
         $(OBJS)\monodll_imagpnm.obj \
         $(OBJS)\monodll_imagpcx.obj \
         $(OBJS)\monodll_imagpng.obj \
         $(OBJS)\monodll_imagpnm.obj \
+       $(OBJS)\monodll_imagtga.obj \
         $(OBJS)\monodll_imagtiff.obj \
         $(OBJS)\monodll_imagxpm.obj \
         $(OBJS)\monodll_layout.obj \
         $(OBJS)\monodll_lboxcmn.obj \
         $(OBJS)\monodll_imagtiff.obj \
         $(OBJS)\monodll_imagxpm.obj \
         $(OBJS)\monodll_layout.obj \
         $(OBJS)\monodll_lboxcmn.obj \
+       $(OBJS)\monodll_listctrlcmn.obj \
         $(OBJS)\monodll_matrix.obj \
         $(OBJS)\monodll_menucmn.obj \
         $(OBJS)\monodll_nbkbase.obj \
         $(OBJS)\monodll_matrix.obj \
         $(OBJS)\monodll_menucmn.obj \
         $(OBJS)\monodll_nbkbase.obj \
+       $(OBJS)\monodll_overlaycmn.obj \
         $(OBJS)\monodll_paper.obj \
         $(OBJS)\monodll_paper.obj \
+       $(OBJS)\monodll_pickerbase.obj \
         $(OBJS)\monodll_popupcmn.obj \
         $(OBJS)\monodll_prntbase.obj \
         $(OBJS)\monodll_quantize.obj \
         $(OBJS)\monodll_popupcmn.obj \
         $(OBJS)\monodll_prntbase.obj \
         $(OBJS)\monodll_quantize.obj \
@@ -1741,6 +1907,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_rgncmn.obj \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
         $(OBJS)\monodll_rgncmn.obj \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
+       $(OBJS)\monodll_srchcmn.obj \
         $(OBJS)\monodll_statbar.obj \
         $(OBJS)\monodll_stockitem.obj \
         $(OBJS)\monodll_tbarbase.obj \
         $(OBJS)\monodll_statbar.obj \
         $(OBJS)\monodll_stockitem.obj \
         $(OBJS)\monodll_tbarbase.obj \
@@ -1754,11 +1921,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_buttonbar.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
+       $(OBJS)\monodll_clrpickerg.obj \
+       $(OBJS)\monodll_collpaneg.obj \
+       $(OBJS)\monodll_combog.obj \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_filepickerg.obj \
+       $(OBJS)\monodll_fontpickerg.obj \
         $(OBJS)\monodll_listbkg.obj \
         $(OBJS)\monodll_logg.obj \
         $(OBJS)\monodll_numdlgg.obj \
         $(OBJS)\monodll_listbkg.obj \
         $(OBJS)\monodll_logg.obj \
         $(OBJS)\monodll_numdlgg.obj \
@@ -1770,27 +1943,40 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_selstore.obj \
         $(OBJS)\monodll_spinctlg.obj \
         $(OBJS)\monodll_splitter.obj \
         $(OBJS)\monodll_selstore.obj \
         $(OBJS)\monodll_spinctlg.obj \
         $(OBJS)\monodll_splitter.obj \
+       $(OBJS)\monodll_srchctlg.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_toolbkg.obj \
         $(OBJS)\monodll_treectlg.obj \
         $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_treebkg.obj \
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_vlbox.obj \
         $(OBJS)\monodll_vscroll.obj
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_animatecmn.obj \
+       $(OBJS)\monodll_datavcmn.obj \
+       $(OBJS)\monodll_hyperlnkcmn.obj \
+       $(OBJS)\monodll_aboutdlgg.obj \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_bmpcboxg.obj \
         $(OBJS)\monodll_calctrl.obj \
         $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datavgen.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_hyperlinkg.obj \
         $(OBJS)\monodll_laywin.obj \
         $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_odcombo.obj \
         $(OBJS)\monodll_propdlg.obj \
         $(OBJS)\monodll_sashwin.obj \
         $(OBJS)\monodll_splash.obj \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
         $(OBJS)\monodll_propdlg.obj \
         $(OBJS)\monodll_sashwin.obj \
         $(OBJS)\monodll_splash.obj \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_aboutdlg.obj \
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_taskbar.obj \
         $(OBJS)\monodll_joystick.obj \
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_taskbar.obj \
         $(OBJS)\monodll_joystick.obj \
@@ -1798,19 +1984,29 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_animatecmn.obj \
+       $(OBJS)\monodll_datavcmn.obj \
+       $(OBJS)\monodll_hyperlnkcmn.obj \
+       $(OBJS)\monodll_aboutdlgg.obj \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_bmpcboxg.obj \
         $(OBJS)\monodll_calctrl.obj \
         $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datavgen.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_hyperlinkg.obj \
         $(OBJS)\monodll_laywin.obj \
         $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_odcombo.obj \
         $(OBJS)\monodll_propdlg.obj \
         $(OBJS)\monodll_sashwin.obj \
         $(OBJS)\monodll_splash.obj \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
         $(OBJS)\monodll_propdlg.obj \
         $(OBJS)\monodll_sashwin.obj \
         $(OBJS)\monodll_splash.obj \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
+       $(OBJS)\monodll_aboutdlg.obj \
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_taskbar.obj \
         $(OBJS)\monodll_joystick.obj
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_taskbar.obj \
         $(OBJS)\monodll_joystick.obj
@@ -1819,24 +2015,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
  __monolib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  __monolib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_94_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_94_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_94_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_95 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_95 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_95 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_100 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_100 = D
  !endif
@@ -1848,11 +2026,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_1_OBJECTS) \
         $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_mediactrlcmn.obj \
         $(____CORE_SRC_FILENAMES_1_OBJECTS) \
         $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_mediactrlcmn.obj \
-       $(OBJS)\monolib_mediactrl.obj \
+       $(OBJS)\monolib_mediactrl_am.obj \
+       $(OBJS)\monolib_mediactrl_wmp10.obj \
+       $(OBJS)\monolib_mediactrl_qt.obj \
+       $(OBJS)\monolib_activex.obj \
         $(OBJS)\monolib_helpbest.obj \
         $(OBJS)\monolib_helpctrl.obj \
         $(OBJS)\monolib_helpdata.obj \
         $(OBJS)\monolib_helpbest.obj \
         $(OBJS)\monolib_helpctrl.obj \
         $(OBJS)\monolib_helpdata.obj \
+       $(OBJS)\monolib_helpdlg.obj \
         $(OBJS)\monolib_helpfrm.obj \
         $(OBJS)\monolib_helpfrm.obj \
+       $(OBJS)\monolib_helpwnd.obj \
         $(OBJS)\monolib_htmlcell.obj \
         $(OBJS)\monolib_htmlfilt.obj \
         $(OBJS)\monolib_htmlpars.obj \
         $(OBJS)\monolib_htmlcell.obj \
         $(OBJS)\monolib_htmlfilt.obj \
         $(OBJS)\monolib_htmlpars.obj \
@@ -1876,32 +2059,43 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_debugrpt.obj \
         $(OBJS)\monolib_dbgrptg.obj \
         $(OBJS)\monolib_dbgrid.obj \
         $(OBJS)\monolib_debugrpt.obj \
         $(OBJS)\monolib_dbgrptg.obj \
         $(OBJS)\monolib_dbgrid.obj \
-       $(OBJS)\monolib_xh_bmpbt.obj \
+       $(OBJS)\monolib_xh_animatctrl.obj \
         $(OBJS)\monolib_xh_bmp.obj \
         $(OBJS)\monolib_xh_bmp.obj \
+       $(OBJS)\monolib_xh_bmpcbox.obj \
+       $(OBJS)\monolib_xh_bmpbt.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_choicbk.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_choicbk.obj \
+       $(OBJS)\monolib_xh_clrpicker.obj \
+       $(OBJS)\monolib_xh_collpane.obj \
         $(OBJS)\monolib_xh_combo.obj \
         $(OBJS)\monolib_xh_datectrl.obj \
         $(OBJS)\monolib_xh_combo.obj \
         $(OBJS)\monolib_xh_datectrl.obj \
+       $(OBJS)\monolib_xh_dirpicker.obj \
         $(OBJS)\monolib_xh_dlg.obj \
         $(OBJS)\monolib_xh_frame.obj \
         $(OBJS)\monolib_xh_mdi.obj \
         $(OBJS)\monolib_xh_dlg.obj \
         $(OBJS)\monolib_xh_frame.obj \
         $(OBJS)\monolib_xh_mdi.obj \
+       $(OBJS)\monolib_xh_filepicker.obj \
+       $(OBJS)\monolib_xh_fontpicker.obj \
         $(OBJS)\monolib_xh_gauge.obj \
         $(OBJS)\monolib_xh_gdctl.obj \
         $(OBJS)\monolib_xh_gauge.obj \
         $(OBJS)\monolib_xh_gdctl.obj \
+       $(OBJS)\monolib_xh_grid.obj \
         $(OBJS)\monolib_xh_html.obj \
         $(OBJS)\monolib_xh_html.obj \
+       $(OBJS)\monolib_xh_hyperlink.obj \
         $(OBJS)\monolib_xh_listb.obj \
         $(OBJS)\monolib_xh_listbk.obj \
         $(OBJS)\monolib_xh_listc.obj \
         $(OBJS)\monolib_xh_menu.obj \
         $(OBJS)\monolib_xh_notbk.obj \
         $(OBJS)\monolib_xh_listb.obj \
         $(OBJS)\monolib_xh_listbk.obj \
         $(OBJS)\monolib_xh_listc.obj \
         $(OBJS)\monolib_xh_menu.obj \
         $(OBJS)\monolib_xh_notbk.obj \
+       $(OBJS)\monolib_xh_odcombo.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_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_htmllbox.obj \
         $(OBJS)\monolib_xh_sizer.obj \
         $(OBJS)\monolib_xh_slidr.obj \
         $(OBJS)\monolib_xh_spin.obj \
         $(OBJS)\monolib_xh_sizer.obj \
         $(OBJS)\monolib_xh_slidr.obj \
         $(OBJS)\monolib_xh_spin.obj \
@@ -1915,10 +2109,25 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_tglbtn.obj \
         $(OBJS)\monolib_xh_toolb.obj \
         $(OBJS)\monolib_xh_tree.obj \
         $(OBJS)\monolib_xh_tglbtn.obj \
         $(OBJS)\monolib_xh_toolb.obj \
         $(OBJS)\monolib_xh_tree.obj \
+       $(OBJS)\monolib_xh_treebk.obj \
         $(OBJS)\monolib_xh_unkwn.obj \
         $(OBJS)\monolib_xh_wizrd.obj \
         $(OBJS)\monolib_xmlres.obj \
         $(OBJS)\monolib_xh_unkwn.obj \
         $(OBJS)\monolib_xh_wizrd.obj \
         $(OBJS)\monolib_xmlres.obj \
-       $(OBJS)\monolib_xmlrsall.obj
+       $(OBJS)\monolib_xmlrsall.obj \
+       $(OBJS)\monolib_framemanager.obj \
+       $(OBJS)\monolib_dockart.obj \
+       $(OBJS)\monolib_floatpane.obj \
+       $(OBJS)\monolib_auibook.obj \
+       $(OBJS)\monolib_tabmdi.obj \
+       $(OBJS)\monolib_richtextctrl.obj \
+       $(OBJS)\monolib_richtextbuffer.obj \
+       $(OBJS)\monolib_richtextstyles.obj \
+       $(OBJS)\monolib_richtextxml.obj \
+       $(OBJS)\monolib_richtexthtml.obj \
+       $(OBJS)\monolib_richtextformatdlg.obj \
+       $(OBJS)\monolib_richtextsymboldlg.obj \
+       $(OBJS)\monolib_richtextstyledlg.obj \
+       $(OBJS)\monolib_richtextprint.obj
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -1945,8 +2154,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontutil.obj \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
         $(OBJS)\monolib_fontutil.obj \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
+       $(OBJS)\monolib_gdiplus.obj \
+       $(OBJS)\monolib_graphics.obj \
         $(OBJS)\monolib_gsockmsw.obj \
         $(OBJS)\monolib_icon.obj \
         $(OBJS)\monolib_gsockmsw.obj \
         $(OBJS)\monolib_icon.obj \
+       $(OBJS)\monolib_imaglist.obj \
         $(OBJS)\monolib_minifram.obj \
         $(OBJS)\monolib_dataobj.obj \
         $(OBJS)\monolib_dropsrc.obj \
         $(OBJS)\monolib_minifram.obj \
         $(OBJS)\monolib_dataobj.obj \
         $(OBJS)\monolib_dropsrc.obj \
@@ -1976,9 +2188,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_bmpbuttn.obj \
         $(OBJS)\monolib_button.obj \
         $(OBJS)\monolib_checkbox.obj \
         $(OBJS)\monolib_bmpbuttn.obj \
         $(OBJS)\monolib_button.obj \
         $(OBJS)\monolib_checkbox.obj \
-       $(OBJS)\monolib_checklst.obj \
         $(OBJS)\monolib_choice.obj \
         $(OBJS)\monolib_colordlg.obj \
         $(OBJS)\monolib_choice.obj \
         $(OBJS)\monolib_colordlg.obj \
+       $(OBJS)\monolib_combo.obj \
         $(OBJS)\monolib_combobox.obj \
         $(OBJS)\monolib_control.obj \
         $(OBJS)\monolib_dialog.obj \
         $(OBJS)\monolib_combobox.obj \
         $(OBJS)\monolib_control.obj \
         $(OBJS)\monolib_dialog.obj \
@@ -1987,7 +2199,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_filedlg.obj \
         $(OBJS)\monolib_frame.obj \
         $(OBJS)\monolib_gauge95.obj \
         $(OBJS)\monolib_filedlg.obj \
         $(OBJS)\monolib_frame.obj \
         $(OBJS)\monolib_gauge95.obj \
-       $(OBJS)\monolib_imaglist.obj \
         $(OBJS)\monolib_iniconf.obj \
         $(OBJS)\monolib_listbox.obj \
         $(OBJS)\monolib_listctrl.obj \
         $(OBJS)\monolib_iniconf.obj \
         $(OBJS)\monolib_listbox.obj \
         $(OBJS)\monolib_listctrl.obj \
@@ -2016,9 +2227,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_tglbtn.obj \
         $(OBJS)\monolib_treectrl.obj \
         $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_tglbtn.obj \
         $(OBJS)\monolib_treectrl.obj \
+       $(OBJS)\monolib_checklst.obj \
         $(OBJS)\monolib_fdrepdlg.obj \
         $(OBJS)\monolib_fontdlg.obj \
         $(OBJS)\monolib_accesscmn.obj \
         $(OBJS)\monolib_fdrepdlg.obj \
         $(OBJS)\monolib_fontdlg.obj \
         $(OBJS)\monolib_accesscmn.obj \
+       $(OBJS)\monolib_anidecod.obj \
         $(OBJS)\monolib_appcmn.obj \
         $(OBJS)\monolib_artprov.obj \
         $(OBJS)\monolib_artstd.obj \
         $(OBJS)\monolib_appcmn.obj \
         $(OBJS)\monolib_artprov.obj \
         $(OBJS)\monolib_artstd.obj \
@@ -2026,6 +2239,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_bookctrl.obj \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
         $(OBJS)\monolib_bookctrl.obj \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
+       $(OBJS)\monolib_clrpickercmn.obj \
+       $(OBJS)\monolib_colourcmn.obj \
+       $(OBJS)\monolib_combocmn.obj \
         $(OBJS)\monolib_cmdproc.obj \
         $(OBJS)\monolib_cmndata.obj \
         $(OBJS)\monolib_containr.obj \
         $(OBJS)\monolib_cmdproc.obj \
         $(OBJS)\monolib_cmndata.obj \
         $(OBJS)\monolib_containr.obj \
@@ -2034,6 +2250,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_ctrlsub.obj \
         $(OBJS)\monolib_datacmn.obj \
         $(OBJS)\monolib_dcbase.obj \
         $(OBJS)\monolib_ctrlsub.obj \
         $(OBJS)\monolib_datacmn.obj \
         $(OBJS)\monolib_dcbase.obj \
+       $(OBJS)\monolib_dcbufcmn.obj \
+       $(OBJS)\monolib_dcgraph.obj \
         $(OBJS)\monolib_dlgcmn.obj \
         $(OBJS)\monolib_dndcmn.obj \
         $(OBJS)\monolib_dobjcmn.obj \
         $(OBJS)\monolib_dlgcmn.obj \
         $(OBJS)\monolib_dndcmn.obj \
         $(OBJS)\monolib_dobjcmn.obj \
@@ -2042,16 +2260,22 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dpycmn.obj \
         $(OBJS)\monolib_dseldlg.obj \
         $(OBJS)\monolib_effects.obj \
         $(OBJS)\monolib_dpycmn.obj \
         $(OBJS)\monolib_dseldlg.obj \
         $(OBJS)\monolib_effects.obj \
+       $(OBJS)\monolib_evtloopcmn.obj \
         $(OBJS)\monolib_fddlgcmn.obj \
         $(OBJS)\monolib_fddlgcmn.obj \
+       $(OBJS)\monolib_filepickercmn.obj \
+       $(OBJS)\monolib_fontpickercmn.obj \
         $(OBJS)\monolib_fldlgcmn.obj \
         $(OBJS)\monolib_fontcmn.obj \
         $(OBJS)\monolib_fldlgcmn.obj \
         $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontenumcmn.obj \
         $(OBJS)\monolib_fontmap.obj \
         $(OBJS)\monolib_fontmap.obj \
+       $(OBJS)\monolib_fontutilcmn.obj \
         $(OBJS)\monolib_framecmn.obj \
         $(OBJS)\monolib_gaugecmn.obj \
         $(OBJS)\monolib_gbsizer.obj \
         $(OBJS)\monolib_gdicmn.obj \
         $(OBJS)\monolib_geometry.obj \
         $(OBJS)\monolib_gifdecod.obj \
         $(OBJS)\monolib_framecmn.obj \
         $(OBJS)\monolib_gaugecmn.obj \
         $(OBJS)\monolib_gbsizer.obj \
         $(OBJS)\monolib_gdicmn.obj \
         $(OBJS)\monolib_geometry.obj \
         $(OBJS)\monolib_gifdecod.obj \
+       $(OBJS)\monolib_graphcmn.obj \
         $(OBJS)\monolib_helpbase.obj \
         $(OBJS)\monolib_iconbndl.obj \
         $(OBJS)\monolib_imagall.obj \
         $(OBJS)\monolib_helpbase.obj \
         $(OBJS)\monolib_iconbndl.obj \
         $(OBJS)\monolib_imagall.obj \
@@ -2064,14 +2288,18 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_imagpcx.obj \
         $(OBJS)\monolib_imagpng.obj \
         $(OBJS)\monolib_imagpnm.obj \
         $(OBJS)\monolib_imagpcx.obj \
         $(OBJS)\monolib_imagpng.obj \
         $(OBJS)\monolib_imagpnm.obj \
+       $(OBJS)\monolib_imagtga.obj \
         $(OBJS)\monolib_imagtiff.obj \
         $(OBJS)\monolib_imagxpm.obj \
         $(OBJS)\monolib_layout.obj \
         $(OBJS)\monolib_lboxcmn.obj \
         $(OBJS)\monolib_imagtiff.obj \
         $(OBJS)\monolib_imagxpm.obj \
         $(OBJS)\monolib_layout.obj \
         $(OBJS)\monolib_lboxcmn.obj \
+       $(OBJS)\monolib_listctrlcmn.obj \
         $(OBJS)\monolib_matrix.obj \
         $(OBJS)\monolib_menucmn.obj \
         $(OBJS)\monolib_nbkbase.obj \
         $(OBJS)\monolib_matrix.obj \
         $(OBJS)\monolib_menucmn.obj \
         $(OBJS)\monolib_nbkbase.obj \
+       $(OBJS)\monolib_overlaycmn.obj \
         $(OBJS)\monolib_paper.obj \
         $(OBJS)\monolib_paper.obj \
+       $(OBJS)\monolib_pickerbase.obj \
         $(OBJS)\monolib_popupcmn.obj \
         $(OBJS)\monolib_prntbase.obj \
         $(OBJS)\monolib_quantize.obj \
         $(OBJS)\monolib_popupcmn.obj \
         $(OBJS)\monolib_prntbase.obj \
         $(OBJS)\monolib_quantize.obj \
@@ -2080,6 +2308,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_rgncmn.obj \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
         $(OBJS)\monolib_rgncmn.obj \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
+       $(OBJS)\monolib_srchcmn.obj \
         $(OBJS)\monolib_statbar.obj \
         $(OBJS)\monolib_stockitem.obj \
         $(OBJS)\monolib_tbarbase.obj \
         $(OBJS)\monolib_statbar.obj \
         $(OBJS)\monolib_stockitem.obj \
         $(OBJS)\monolib_tbarbase.obj \
@@ -2093,11 +2322,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_buttonbar.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_combog.obj \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \
         $(OBJS)\monolib_listbkg.obj \
         $(OBJS)\monolib_logg.obj \
         $(OBJS)\monolib_numdlgg.obj \
         $(OBJS)\monolib_listbkg.obj \
         $(OBJS)\monolib_logg.obj \
         $(OBJS)\monolib_numdlgg.obj \
@@ -2109,9 +2344,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_selstore.obj \
         $(OBJS)\monolib_spinctlg.obj \
         $(OBJS)\monolib_splitter.obj \
         $(OBJS)\monolib_selstore.obj \
         $(OBJS)\monolib_spinctlg.obj \
         $(OBJS)\monolib_splitter.obj \
+       $(OBJS)\monolib_srchctlg.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_toolbkg.obj \
         $(OBJS)\monolib_treectlg.obj \
         $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_treebkg.obj \
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
@@ -2140,8 +2378,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontutil.obj \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
         $(OBJS)\monolib_fontutil.obj \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
+       $(OBJS)\monolib_gdiplus.obj \
+       $(OBJS)\monolib_graphics.obj \
         $(OBJS)\monolib_gsockmsw.obj \
         $(OBJS)\monolib_icon.obj \
         $(OBJS)\monolib_gsockmsw.obj \
         $(OBJS)\monolib_icon.obj \
+       $(OBJS)\monolib_imaglist.obj \
         $(OBJS)\monolib_minifram.obj \
         $(OBJS)\monolib_dataobj.obj \
         $(OBJS)\monolib_dropsrc.obj \
         $(OBJS)\monolib_minifram.obj \
         $(OBJS)\monolib_dataobj.obj \
         $(OBJS)\monolib_dropsrc.obj \
@@ -2171,7 +2412,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fdrepdlg.obj \
         $(OBJS)\monolib_filedlgg.obj \
         $(OBJS)\monolib_fontdlgg.obj \
         $(OBJS)\monolib_fdrepdlg.obj \
         $(OBJS)\monolib_filedlgg.obj \
         $(OBJS)\monolib_fontdlgg.obj \
-       $(OBJS)\monolib_imaglist.obj \
         $(OBJS)\monolib_listctrl.obj \
         $(OBJS)\monolib_mdig.obj \
         $(OBJS)\monolib_msgdlgg.obj \
         $(OBJS)\monolib_listctrl.obj \
         $(OBJS)\monolib_mdig.obj \
         $(OBJS)\monolib_msgdlgg.obj \
@@ -2206,15 +2446,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_statline.obj \
         $(OBJS)\monolib_stattext.obj \
         $(OBJS)\monolib_statusbr.obj \
         $(OBJS)\monolib_statline.obj \
         $(OBJS)\monolib_stattext.obj \
         $(OBJS)\monolib_statusbr.obj \
+       $(OBJS)\monolib_stdrend.obj \
         $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_textctrl.obj \
+       $(OBJS)\monolib_tglbtn.obj \
         $(OBJS)\monolib_theme.obj \
         $(OBJS)\monolib_toolbar.obj \
         $(OBJS)\monolib_topluniv.obj \
         $(OBJS)\monolib_winuniv.obj \
         $(OBJS)\monolib_gtk.obj \
         $(OBJS)\monolib_metal.obj \
         $(OBJS)\monolib_theme.obj \
         $(OBJS)\monolib_toolbar.obj \
         $(OBJS)\monolib_topluniv.obj \
         $(OBJS)\monolib_winuniv.obj \
         $(OBJS)\monolib_gtk.obj \
         $(OBJS)\monolib_metal.obj \
+       $(OBJS)\monolib_mono.obj \
         $(OBJS)\monolib_win32.obj \
         $(OBJS)\monolib_accesscmn.obj \
         $(OBJS)\monolib_win32.obj \
         $(OBJS)\monolib_accesscmn.obj \
+       $(OBJS)\monolib_anidecod.obj \
         $(OBJS)\monolib_appcmn.obj \
         $(OBJS)\monolib_artprov.obj \
         $(OBJS)\monolib_artstd.obj \
         $(OBJS)\monolib_appcmn.obj \
         $(OBJS)\monolib_artprov.obj \
         $(OBJS)\monolib_artstd.obj \
@@ -2222,6 +2466,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_bookctrl.obj \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
         $(OBJS)\monolib_bookctrl.obj \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
+       $(OBJS)\monolib_clrpickercmn.obj \
+       $(OBJS)\monolib_colourcmn.obj \
+       $(OBJS)\monolib_combocmn.obj \
         $(OBJS)\monolib_cmdproc.obj \
         $(OBJS)\monolib_cmndata.obj \
         $(OBJS)\monolib_containr.obj \
         $(OBJS)\monolib_cmdproc.obj \
         $(OBJS)\monolib_cmndata.obj \
         $(OBJS)\monolib_containr.obj \
@@ -2230,6 +2477,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_ctrlsub.obj \
         $(OBJS)\monolib_datacmn.obj \
         $(OBJS)\monolib_dcbase.obj \
         $(OBJS)\monolib_ctrlsub.obj \
         $(OBJS)\monolib_datacmn.obj \
         $(OBJS)\monolib_dcbase.obj \
+       $(OBJS)\monolib_dcbufcmn.obj \
+       $(OBJS)\monolib_dcgraph.obj \
         $(OBJS)\monolib_dlgcmn.obj \
         $(OBJS)\monolib_dndcmn.obj \
         $(OBJS)\monolib_dobjcmn.obj \
         $(OBJS)\monolib_dlgcmn.obj \
         $(OBJS)\monolib_dndcmn.obj \
         $(OBJS)\monolib_dobjcmn.obj \
@@ -2238,16 +2487,22 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dpycmn.obj \
         $(OBJS)\monolib_dseldlg.obj \
         $(OBJS)\monolib_effects.obj \
         $(OBJS)\monolib_dpycmn.obj \
         $(OBJS)\monolib_dseldlg.obj \
         $(OBJS)\monolib_effects.obj \
+       $(OBJS)\monolib_evtloopcmn.obj \
         $(OBJS)\monolib_fddlgcmn.obj \
         $(OBJS)\monolib_fddlgcmn.obj \
+       $(OBJS)\monolib_filepickercmn.obj \
+       $(OBJS)\monolib_fontpickercmn.obj \
         $(OBJS)\monolib_fldlgcmn.obj \
         $(OBJS)\monolib_fontcmn.obj \
         $(OBJS)\monolib_fldlgcmn.obj \
         $(OBJS)\monolib_fontcmn.obj \
+       $(OBJS)\monolib_fontenumcmn.obj \
         $(OBJS)\monolib_fontmap.obj \
         $(OBJS)\monolib_fontmap.obj \
+       $(OBJS)\monolib_fontutilcmn.obj \
         $(OBJS)\monolib_framecmn.obj \
         $(OBJS)\monolib_gaugecmn.obj \
         $(OBJS)\monolib_gbsizer.obj \
         $(OBJS)\monolib_gdicmn.obj \
         $(OBJS)\monolib_geometry.obj \
         $(OBJS)\monolib_gifdecod.obj \
         $(OBJS)\monolib_framecmn.obj \
         $(OBJS)\monolib_gaugecmn.obj \
         $(OBJS)\monolib_gbsizer.obj \
         $(OBJS)\monolib_gdicmn.obj \
         $(OBJS)\monolib_geometry.obj \
         $(OBJS)\monolib_gifdecod.obj \
+       $(OBJS)\monolib_graphcmn.obj \
         $(OBJS)\monolib_helpbase.obj \
         $(OBJS)\monolib_iconbndl.obj \
         $(OBJS)\monolib_imagall.obj \
         $(OBJS)\monolib_helpbase.obj \
         $(OBJS)\monolib_iconbndl.obj \
         $(OBJS)\monolib_imagall.obj \
@@ -2260,14 +2515,18 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_imagpcx.obj \
         $(OBJS)\monolib_imagpng.obj \
         $(OBJS)\monolib_imagpnm.obj \
         $(OBJS)\monolib_imagpcx.obj \
         $(OBJS)\monolib_imagpng.obj \
         $(OBJS)\monolib_imagpnm.obj \
+       $(OBJS)\monolib_imagtga.obj \
         $(OBJS)\monolib_imagtiff.obj \
         $(OBJS)\monolib_imagxpm.obj \
         $(OBJS)\monolib_layout.obj \
         $(OBJS)\monolib_lboxcmn.obj \
         $(OBJS)\monolib_imagtiff.obj \
         $(OBJS)\monolib_imagxpm.obj \
         $(OBJS)\monolib_layout.obj \
         $(OBJS)\monolib_lboxcmn.obj \
+       $(OBJS)\monolib_listctrlcmn.obj \
         $(OBJS)\monolib_matrix.obj \
         $(OBJS)\monolib_menucmn.obj \
         $(OBJS)\monolib_nbkbase.obj \
         $(OBJS)\monolib_matrix.obj \
         $(OBJS)\monolib_menucmn.obj \
         $(OBJS)\monolib_nbkbase.obj \
+       $(OBJS)\monolib_overlaycmn.obj \
         $(OBJS)\monolib_paper.obj \
         $(OBJS)\monolib_paper.obj \
+       $(OBJS)\monolib_pickerbase.obj \
         $(OBJS)\monolib_popupcmn.obj \
         $(OBJS)\monolib_prntbase.obj \
         $(OBJS)\monolib_quantize.obj \
         $(OBJS)\monolib_popupcmn.obj \
         $(OBJS)\monolib_prntbase.obj \
         $(OBJS)\monolib_quantize.obj \
@@ -2276,6 +2535,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_rgncmn.obj \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
         $(OBJS)\monolib_rgncmn.obj \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
+       $(OBJS)\monolib_srchcmn.obj \
         $(OBJS)\monolib_statbar.obj \
         $(OBJS)\monolib_stockitem.obj \
         $(OBJS)\monolib_tbarbase.obj \
         $(OBJS)\monolib_statbar.obj \
         $(OBJS)\monolib_stockitem.obj \
         $(OBJS)\monolib_tbarbase.obj \
@@ -2289,11 +2549,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_buttonbar.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
+       $(OBJS)\monolib_clrpickerg.obj \
+       $(OBJS)\monolib_collpaneg.obj \
+       $(OBJS)\monolib_combog.obj \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_filepickerg.obj \
+       $(OBJS)\monolib_fontpickerg.obj \
         $(OBJS)\monolib_listbkg.obj \
         $(OBJS)\monolib_logg.obj \
         $(OBJS)\monolib_numdlgg.obj \
         $(OBJS)\monolib_listbkg.obj \
         $(OBJS)\monolib_logg.obj \
         $(OBJS)\monolib_numdlgg.obj \
@@ -2305,27 +2571,40 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_selstore.obj \
         $(OBJS)\monolib_spinctlg.obj \
         $(OBJS)\monolib_splitter.obj \
         $(OBJS)\monolib_selstore.obj \
         $(OBJS)\monolib_spinctlg.obj \
         $(OBJS)\monolib_splitter.obj \
+       $(OBJS)\monolib_srchctlg.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_toolbkg.obj \
         $(OBJS)\monolib_treectlg.obj \
         $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_treebkg.obj \
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_vlbox.obj \
         $(OBJS)\monolib_vscroll.obj
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_animatecmn.obj \
+       $(OBJS)\monolib_datavcmn.obj \
+       $(OBJS)\monolib_hyperlnkcmn.obj \
+       $(OBJS)\monolib_aboutdlgg.obj \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_bmpcboxg.obj \
         $(OBJS)\monolib_calctrl.obj \
         $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datavgen.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_hyperlinkg.obj \
         $(OBJS)\monolib_laywin.obj \
         $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_odcombo.obj \
         $(OBJS)\monolib_propdlg.obj \
         $(OBJS)\monolib_sashwin.obj \
         $(OBJS)\monolib_splash.obj \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
         $(OBJS)\monolib_propdlg.obj \
         $(OBJS)\monolib_sashwin.obj \
         $(OBJS)\monolib_splash.obj \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_aboutdlg.obj \
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_taskbar.obj \
         $(OBJS)\monolib_joystick.obj \
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_taskbar.obj \
         $(OBJS)\monolib_joystick.obj \
@@ -2333,19 +2612,29 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_animatecmn.obj \
+       $(OBJS)\monolib_datavcmn.obj \
+       $(OBJS)\monolib_hyperlnkcmn.obj \
+       $(OBJS)\monolib_aboutdlgg.obj \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_bmpcboxg.obj \
         $(OBJS)\monolib_calctrl.obj \
         $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datavgen.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_hyperlinkg.obj \
         $(OBJS)\monolib_laywin.obj \
         $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_odcombo.obj \
         $(OBJS)\monolib_propdlg.obj \
         $(OBJS)\monolib_sashwin.obj \
         $(OBJS)\monolib_splash.obj \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
         $(OBJS)\monolib_propdlg.obj \
         $(OBJS)\monolib_sashwin.obj \
         $(OBJS)\monolib_splash.obj \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
+       $(OBJS)\monolib_aboutdlg.obj \
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_taskbar.obj \
         $(OBJS)\monolib_joystick.obj
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_taskbar.obj \
         $(OBJS)\monolib_joystick.obj
@@ -2354,33 +2643,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
  __basedll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  __basedll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_108_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_108_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_108_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_108_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_108_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_108_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_109 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_109 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_109 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_114 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_114 = D
  !endif
@@ -2391,61 +2653,22 @@ __RUNTIME_LIBS_114 = $(__THREADSFLAG)
  __baselib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  __baselib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_121_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_121_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_121_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_122 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_122 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_122 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_127 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_127 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_127 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_127 = $(__THREADSFLAG)
  !endif
+!if "$(SHARED)" == "1"
+____wxbase_namedll_DEP = $(__basedll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxbase_namelib_DEP = $(__baselib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __netdll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __netdll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_135_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_135_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_135_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_135_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_135_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_135_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_136 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_136 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_136 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_141 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_141 = D
  !endif
@@ -2456,61 +2679,22 @@ __RUNTIME_LIBS_141 = $(__THREADSFLAG)
  __netlib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  !endif
  __netlib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_148_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_148_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_148_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_149 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_149 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_149 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_154 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_154 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_154 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_154 = $(__THREADSFLAG)
  !endif
+!if "$(SHARED)" == "1"
+____wxnet_namedll_DEP = $(__netdll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxnet_namelib_DEP = $(__netlib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __coredll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __coredll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_162_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_162_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_162_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_162_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_162_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_162_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_163 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_163 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_163 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_168 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_168 = D
  !endif
@@ -2542,8 +2726,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontutil.obj \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
         $(OBJS)\coredll_fontutil.obj \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
+       $(OBJS)\coredll_gdiplus.obj \
+       $(OBJS)\coredll_graphics.obj \
         $(OBJS)\coredll_gsockmsw.obj \
         $(OBJS)\coredll_icon.obj \
         $(OBJS)\coredll_gsockmsw.obj \
         $(OBJS)\coredll_icon.obj \
+       $(OBJS)\coredll_imaglist.obj \
         $(OBJS)\coredll_minifram.obj \
         $(OBJS)\coredll_dataobj.obj \
         $(OBJS)\coredll_dropsrc.obj \
         $(OBJS)\coredll_minifram.obj \
         $(OBJS)\coredll_dataobj.obj \
         $(OBJS)\coredll_dropsrc.obj \
@@ -2573,9 +2760,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_bmpbuttn.obj \
         $(OBJS)\coredll_button.obj \
         $(OBJS)\coredll_checkbox.obj \
         $(OBJS)\coredll_bmpbuttn.obj \
         $(OBJS)\coredll_button.obj \
         $(OBJS)\coredll_checkbox.obj \
-       $(OBJS)\coredll_checklst.obj \
         $(OBJS)\coredll_choice.obj \
         $(OBJS)\coredll_colordlg.obj \
         $(OBJS)\coredll_choice.obj \
         $(OBJS)\coredll_colordlg.obj \
+       $(OBJS)\coredll_combo.obj \
         $(OBJS)\coredll_combobox.obj \
         $(OBJS)\coredll_control.obj \
         $(OBJS)\coredll_dialog.obj \
         $(OBJS)\coredll_combobox.obj \
         $(OBJS)\coredll_control.obj \
         $(OBJS)\coredll_dialog.obj \
@@ -2584,7 +2771,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_filedlg.obj \
         $(OBJS)\coredll_frame.obj \
         $(OBJS)\coredll_gauge95.obj \
         $(OBJS)\coredll_filedlg.obj \
         $(OBJS)\coredll_frame.obj \
         $(OBJS)\coredll_gauge95.obj \
-       $(OBJS)\coredll_imaglist.obj \
         $(OBJS)\coredll_iniconf.obj \
         $(OBJS)\coredll_listbox.obj \
         $(OBJS)\coredll_listctrl.obj \
         $(OBJS)\coredll_iniconf.obj \
         $(OBJS)\coredll_listbox.obj \
         $(OBJS)\coredll_listctrl.obj \
@@ -2613,9 +2799,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_tglbtn.obj \
         $(OBJS)\coredll_treectrl.obj \
         $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_tglbtn.obj \
         $(OBJS)\coredll_treectrl.obj \
+       $(OBJS)\coredll_checklst.obj \
         $(OBJS)\coredll_fdrepdlg.obj \
         $(OBJS)\coredll_fontdlg.obj \
         $(OBJS)\coredll_accesscmn.obj \
         $(OBJS)\coredll_fdrepdlg.obj \
         $(OBJS)\coredll_fontdlg.obj \
         $(OBJS)\coredll_accesscmn.obj \
+       $(OBJS)\coredll_anidecod.obj \
         $(OBJS)\coredll_appcmn.obj \
         $(OBJS)\coredll_artprov.obj \
         $(OBJS)\coredll_artstd.obj \
         $(OBJS)\coredll_appcmn.obj \
         $(OBJS)\coredll_artprov.obj \
         $(OBJS)\coredll_artstd.obj \
@@ -2623,6 +2811,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_bookctrl.obj \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
         $(OBJS)\coredll_bookctrl.obj \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
+       $(OBJS)\coredll_clrpickercmn.obj \
+       $(OBJS)\coredll_colourcmn.obj \
+       $(OBJS)\coredll_combocmn.obj \
         $(OBJS)\coredll_cmdproc.obj \
         $(OBJS)\coredll_cmndata.obj \
         $(OBJS)\coredll_containr.obj \
         $(OBJS)\coredll_cmdproc.obj \
         $(OBJS)\coredll_cmndata.obj \
         $(OBJS)\coredll_containr.obj \
@@ -2631,6 +2822,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_ctrlsub.obj \
         $(OBJS)\coredll_datacmn.obj \
         $(OBJS)\coredll_dcbase.obj \
         $(OBJS)\coredll_ctrlsub.obj \
         $(OBJS)\coredll_datacmn.obj \
         $(OBJS)\coredll_dcbase.obj \
+       $(OBJS)\coredll_dcbufcmn.obj \
+       $(OBJS)\coredll_dcgraph.obj \
         $(OBJS)\coredll_dlgcmn.obj \
         $(OBJS)\coredll_dndcmn.obj \
         $(OBJS)\coredll_dobjcmn.obj \
         $(OBJS)\coredll_dlgcmn.obj \
         $(OBJS)\coredll_dndcmn.obj \
         $(OBJS)\coredll_dobjcmn.obj \
@@ -2639,16 +2832,22 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dpycmn.obj \
         $(OBJS)\coredll_dseldlg.obj \
         $(OBJS)\coredll_effects.obj \
         $(OBJS)\coredll_dpycmn.obj \
         $(OBJS)\coredll_dseldlg.obj \
         $(OBJS)\coredll_effects.obj \
+       $(OBJS)\coredll_evtloopcmn.obj \
         $(OBJS)\coredll_fddlgcmn.obj \
         $(OBJS)\coredll_fddlgcmn.obj \
+       $(OBJS)\coredll_filepickercmn.obj \
+       $(OBJS)\coredll_fontpickercmn.obj \
         $(OBJS)\coredll_fldlgcmn.obj \
         $(OBJS)\coredll_fontcmn.obj \
         $(OBJS)\coredll_fldlgcmn.obj \
         $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontenumcmn.obj \
         $(OBJS)\coredll_fontmap.obj \
         $(OBJS)\coredll_fontmap.obj \
+       $(OBJS)\coredll_fontutilcmn.obj \
         $(OBJS)\coredll_framecmn.obj \
         $(OBJS)\coredll_gaugecmn.obj \
         $(OBJS)\coredll_gbsizer.obj \
         $(OBJS)\coredll_gdicmn.obj \
         $(OBJS)\coredll_geometry.obj \
         $(OBJS)\coredll_gifdecod.obj \
         $(OBJS)\coredll_framecmn.obj \
         $(OBJS)\coredll_gaugecmn.obj \
         $(OBJS)\coredll_gbsizer.obj \
         $(OBJS)\coredll_gdicmn.obj \
         $(OBJS)\coredll_geometry.obj \
         $(OBJS)\coredll_gifdecod.obj \
+       $(OBJS)\coredll_graphcmn.obj \
         $(OBJS)\coredll_helpbase.obj \
         $(OBJS)\coredll_iconbndl.obj \
         $(OBJS)\coredll_imagall.obj \
         $(OBJS)\coredll_helpbase.obj \
         $(OBJS)\coredll_iconbndl.obj \
         $(OBJS)\coredll_imagall.obj \
@@ -2661,14 +2860,18 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_imagpcx.obj \
         $(OBJS)\coredll_imagpng.obj \
         $(OBJS)\coredll_imagpnm.obj \
         $(OBJS)\coredll_imagpcx.obj \
         $(OBJS)\coredll_imagpng.obj \
         $(OBJS)\coredll_imagpnm.obj \
+       $(OBJS)\coredll_imagtga.obj \
         $(OBJS)\coredll_imagtiff.obj \
         $(OBJS)\coredll_imagxpm.obj \
         $(OBJS)\coredll_layout.obj \
         $(OBJS)\coredll_lboxcmn.obj \
         $(OBJS)\coredll_imagtiff.obj \
         $(OBJS)\coredll_imagxpm.obj \
         $(OBJS)\coredll_layout.obj \
         $(OBJS)\coredll_lboxcmn.obj \
+       $(OBJS)\coredll_listctrlcmn.obj \
         $(OBJS)\coredll_matrix.obj \
         $(OBJS)\coredll_menucmn.obj \
         $(OBJS)\coredll_nbkbase.obj \
         $(OBJS)\coredll_matrix.obj \
         $(OBJS)\coredll_menucmn.obj \
         $(OBJS)\coredll_nbkbase.obj \
+       $(OBJS)\coredll_overlaycmn.obj \
         $(OBJS)\coredll_paper.obj \
         $(OBJS)\coredll_paper.obj \
+       $(OBJS)\coredll_pickerbase.obj \
         $(OBJS)\coredll_popupcmn.obj \
         $(OBJS)\coredll_prntbase.obj \
         $(OBJS)\coredll_quantize.obj \
         $(OBJS)\coredll_popupcmn.obj \
         $(OBJS)\coredll_prntbase.obj \
         $(OBJS)\coredll_quantize.obj \
@@ -2677,6 +2880,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_rgncmn.obj \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
         $(OBJS)\coredll_rgncmn.obj \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
+       $(OBJS)\coredll_srchcmn.obj \
         $(OBJS)\coredll_statbar.obj \
         $(OBJS)\coredll_stockitem.obj \
         $(OBJS)\coredll_tbarbase.obj \
         $(OBJS)\coredll_statbar.obj \
         $(OBJS)\coredll_stockitem.obj \
         $(OBJS)\coredll_tbarbase.obj \
@@ -2690,11 +2894,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_buttonbar.obj \
         $(OBJS)\coredll_choicdgg.obj \
         $(OBJS)\coredll_choicbkg.obj \
         $(OBJS)\coredll_choicdgg.obj \
         $(OBJS)\coredll_choicbkg.obj \
+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_combog.obj \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \
         $(OBJS)\coredll_listbkg.obj \
         $(OBJS)\coredll_logg.obj \
         $(OBJS)\coredll_numdlgg.obj \
         $(OBJS)\coredll_listbkg.obj \
         $(OBJS)\coredll_logg.obj \
         $(OBJS)\coredll_numdlgg.obj \
@@ -2706,9 +2916,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_selstore.obj \
         $(OBJS)\coredll_spinctlg.obj \
         $(OBJS)\coredll_splitter.obj \
         $(OBJS)\coredll_selstore.obj \
         $(OBJS)\coredll_spinctlg.obj \
         $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_srchctlg.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_toolbkg.obj \
         $(OBJS)\coredll_treectlg.obj \
         $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_treebkg.obj \
         $(OBJS)\coredll_vlbox.obj \
         $(OBJS)\coredll_vscroll.obj
  !endif
         $(OBJS)\coredll_vlbox.obj \
         $(OBJS)\coredll_vscroll.obj
  !endif
@@ -2737,8 +2950,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontutil.obj \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
         $(OBJS)\coredll_fontutil.obj \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
+       $(OBJS)\coredll_gdiplus.obj \
+       $(OBJS)\coredll_graphics.obj \
         $(OBJS)\coredll_gsockmsw.obj \
         $(OBJS)\coredll_icon.obj \
         $(OBJS)\coredll_gsockmsw.obj \
         $(OBJS)\coredll_icon.obj \
+       $(OBJS)\coredll_imaglist.obj \
         $(OBJS)\coredll_minifram.obj \
         $(OBJS)\coredll_dataobj.obj \
         $(OBJS)\coredll_dropsrc.obj \
         $(OBJS)\coredll_minifram.obj \
         $(OBJS)\coredll_dataobj.obj \
         $(OBJS)\coredll_dropsrc.obj \
@@ -2768,7 +2984,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fdrepdlg.obj \
         $(OBJS)\coredll_filedlgg.obj \
         $(OBJS)\coredll_fontdlgg.obj \
         $(OBJS)\coredll_fdrepdlg.obj \
         $(OBJS)\coredll_filedlgg.obj \
         $(OBJS)\coredll_fontdlgg.obj \
-       $(OBJS)\coredll_imaglist.obj \
         $(OBJS)\coredll_listctrl.obj \
         $(OBJS)\coredll_mdig.obj \
         $(OBJS)\coredll_msgdlgg.obj \
         $(OBJS)\coredll_listctrl.obj \
         $(OBJS)\coredll_mdig.obj \
         $(OBJS)\coredll_msgdlgg.obj \
@@ -2803,15 +3018,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_statline.obj \
         $(OBJS)\coredll_stattext.obj \
         $(OBJS)\coredll_statusbr.obj \
         $(OBJS)\coredll_statline.obj \
         $(OBJS)\coredll_stattext.obj \
         $(OBJS)\coredll_statusbr.obj \
+       $(OBJS)\coredll_stdrend.obj \
         $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_textctrl.obj \
+       $(OBJS)\coredll_tglbtn.obj \
         $(OBJS)\coredll_theme.obj \
         $(OBJS)\coredll_toolbar.obj \
         $(OBJS)\coredll_topluniv.obj \
         $(OBJS)\coredll_winuniv.obj \
         $(OBJS)\coredll_gtk.obj \
         $(OBJS)\coredll_metal.obj \
         $(OBJS)\coredll_theme.obj \
         $(OBJS)\coredll_toolbar.obj \
         $(OBJS)\coredll_topluniv.obj \
         $(OBJS)\coredll_winuniv.obj \
         $(OBJS)\coredll_gtk.obj \
         $(OBJS)\coredll_metal.obj \
+       $(OBJS)\coredll_mono.obj \
         $(OBJS)\coredll_win32.obj \
         $(OBJS)\coredll_accesscmn.obj \
         $(OBJS)\coredll_win32.obj \
         $(OBJS)\coredll_accesscmn.obj \
+       $(OBJS)\coredll_anidecod.obj \
         $(OBJS)\coredll_appcmn.obj \
         $(OBJS)\coredll_artprov.obj \
         $(OBJS)\coredll_artstd.obj \
         $(OBJS)\coredll_appcmn.obj \
         $(OBJS)\coredll_artprov.obj \
         $(OBJS)\coredll_artstd.obj \
@@ -2819,6 +3038,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_bookctrl.obj \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
         $(OBJS)\coredll_bookctrl.obj \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
+       $(OBJS)\coredll_clrpickercmn.obj \
+       $(OBJS)\coredll_colourcmn.obj \
+       $(OBJS)\coredll_combocmn.obj \
         $(OBJS)\coredll_cmdproc.obj \
         $(OBJS)\coredll_cmndata.obj \
         $(OBJS)\coredll_containr.obj \
         $(OBJS)\coredll_cmdproc.obj \
         $(OBJS)\coredll_cmndata.obj \
         $(OBJS)\coredll_containr.obj \
@@ -2827,6 +3049,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_ctrlsub.obj \
         $(OBJS)\coredll_datacmn.obj \
         $(OBJS)\coredll_dcbase.obj \
         $(OBJS)\coredll_ctrlsub.obj \
         $(OBJS)\coredll_datacmn.obj \
         $(OBJS)\coredll_dcbase.obj \
+       $(OBJS)\coredll_dcbufcmn.obj \
+       $(OBJS)\coredll_dcgraph.obj \
         $(OBJS)\coredll_dlgcmn.obj \
         $(OBJS)\coredll_dndcmn.obj \
         $(OBJS)\coredll_dobjcmn.obj \
         $(OBJS)\coredll_dlgcmn.obj \
         $(OBJS)\coredll_dndcmn.obj \
         $(OBJS)\coredll_dobjcmn.obj \
@@ -2835,16 +3059,22 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dpycmn.obj \
         $(OBJS)\coredll_dseldlg.obj \
         $(OBJS)\coredll_effects.obj \
         $(OBJS)\coredll_dpycmn.obj \
         $(OBJS)\coredll_dseldlg.obj \
         $(OBJS)\coredll_effects.obj \
+       $(OBJS)\coredll_evtloopcmn.obj \
         $(OBJS)\coredll_fddlgcmn.obj \
         $(OBJS)\coredll_fddlgcmn.obj \
+       $(OBJS)\coredll_filepickercmn.obj \
+       $(OBJS)\coredll_fontpickercmn.obj \
         $(OBJS)\coredll_fldlgcmn.obj \
         $(OBJS)\coredll_fontcmn.obj \
         $(OBJS)\coredll_fldlgcmn.obj \
         $(OBJS)\coredll_fontcmn.obj \
+       $(OBJS)\coredll_fontenumcmn.obj \
         $(OBJS)\coredll_fontmap.obj \
         $(OBJS)\coredll_fontmap.obj \
+       $(OBJS)\coredll_fontutilcmn.obj \
         $(OBJS)\coredll_framecmn.obj \
         $(OBJS)\coredll_gaugecmn.obj \
         $(OBJS)\coredll_gbsizer.obj \
         $(OBJS)\coredll_gdicmn.obj \
         $(OBJS)\coredll_geometry.obj \
         $(OBJS)\coredll_gifdecod.obj \
         $(OBJS)\coredll_framecmn.obj \
         $(OBJS)\coredll_gaugecmn.obj \
         $(OBJS)\coredll_gbsizer.obj \
         $(OBJS)\coredll_gdicmn.obj \
         $(OBJS)\coredll_geometry.obj \
         $(OBJS)\coredll_gifdecod.obj \
+       $(OBJS)\coredll_graphcmn.obj \
         $(OBJS)\coredll_helpbase.obj \
         $(OBJS)\coredll_iconbndl.obj \
         $(OBJS)\coredll_imagall.obj \
         $(OBJS)\coredll_helpbase.obj \
         $(OBJS)\coredll_iconbndl.obj \
         $(OBJS)\coredll_imagall.obj \
@@ -2857,14 +3087,18 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_imagpcx.obj \
         $(OBJS)\coredll_imagpng.obj \
         $(OBJS)\coredll_imagpnm.obj \
         $(OBJS)\coredll_imagpcx.obj \
         $(OBJS)\coredll_imagpng.obj \
         $(OBJS)\coredll_imagpnm.obj \
+       $(OBJS)\coredll_imagtga.obj \
         $(OBJS)\coredll_imagtiff.obj \
         $(OBJS)\coredll_imagxpm.obj \
         $(OBJS)\coredll_layout.obj \
         $(OBJS)\coredll_lboxcmn.obj \
         $(OBJS)\coredll_imagtiff.obj \
         $(OBJS)\coredll_imagxpm.obj \
         $(OBJS)\coredll_layout.obj \
         $(OBJS)\coredll_lboxcmn.obj \
+       $(OBJS)\coredll_listctrlcmn.obj \
         $(OBJS)\coredll_matrix.obj \
         $(OBJS)\coredll_menucmn.obj \
         $(OBJS)\coredll_nbkbase.obj \
         $(OBJS)\coredll_matrix.obj \
         $(OBJS)\coredll_menucmn.obj \
         $(OBJS)\coredll_nbkbase.obj \
+       $(OBJS)\coredll_overlaycmn.obj \
         $(OBJS)\coredll_paper.obj \
         $(OBJS)\coredll_paper.obj \
+       $(OBJS)\coredll_pickerbase.obj \
         $(OBJS)\coredll_popupcmn.obj \
         $(OBJS)\coredll_prntbase.obj \
         $(OBJS)\coredll_quantize.obj \
         $(OBJS)\coredll_popupcmn.obj \
         $(OBJS)\coredll_prntbase.obj \
         $(OBJS)\coredll_quantize.obj \
@@ -2873,6 +3107,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_rgncmn.obj \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
         $(OBJS)\coredll_rgncmn.obj \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
+       $(OBJS)\coredll_srchcmn.obj \
         $(OBJS)\coredll_statbar.obj \
         $(OBJS)\coredll_stockitem.obj \
         $(OBJS)\coredll_tbarbase.obj \
         $(OBJS)\coredll_statbar.obj \
         $(OBJS)\coredll_stockitem.obj \
         $(OBJS)\coredll_tbarbase.obj \
@@ -2886,11 +3121,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_buttonbar.obj \
         $(OBJS)\coredll_choicdgg.obj \
         $(OBJS)\coredll_choicbkg.obj \
         $(OBJS)\coredll_choicdgg.obj \
         $(OBJS)\coredll_choicbkg.obj \
+       $(OBJS)\coredll_clrpickerg.obj \
+       $(OBJS)\coredll_collpaneg.obj \
+       $(OBJS)\coredll_combog.obj \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_filepickerg.obj \
+       $(OBJS)\coredll_fontpickerg.obj \
         $(OBJS)\coredll_listbkg.obj \
         $(OBJS)\coredll_logg.obj \
         $(OBJS)\coredll_numdlgg.obj \
         $(OBJS)\coredll_listbkg.obj \
         $(OBJS)\coredll_logg.obj \
         $(OBJS)\coredll_numdlgg.obj \
@@ -2902,9 +3143,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_selstore.obj \
         $(OBJS)\coredll_spinctlg.obj \
         $(OBJS)\coredll_splitter.obj \
         $(OBJS)\coredll_selstore.obj \
         $(OBJS)\coredll_spinctlg.obj \
         $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_srchctlg.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_toolbkg.obj \
         $(OBJS)\coredll_treectlg.obj \
         $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_treebkg.obj \
         $(OBJS)\coredll_vlbox.obj \
         $(OBJS)\coredll_vscroll.obj
  !endif
         $(OBJS)\coredll_vlbox.obj \
         $(OBJS)\coredll_vscroll.obj
  !endif
@@ -2912,24 +3156,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
  __corelib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
  __corelib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_175_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_175_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_175_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_176 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_176 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_176 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_181 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_181 = D
  !endif
@@ -2961,8 +3187,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontutil.obj \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
         $(OBJS)\corelib_fontutil.obj \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
+       $(OBJS)\corelib_gdiplus.obj \
+       $(OBJS)\corelib_graphics.obj \
         $(OBJS)\corelib_gsockmsw.obj \
         $(OBJS)\corelib_icon.obj \
         $(OBJS)\corelib_gsockmsw.obj \
         $(OBJS)\corelib_icon.obj \
+       $(OBJS)\corelib_imaglist.obj \
         $(OBJS)\corelib_minifram.obj \
         $(OBJS)\corelib_dataobj.obj \
         $(OBJS)\corelib_dropsrc.obj \
         $(OBJS)\corelib_minifram.obj \
         $(OBJS)\corelib_dataobj.obj \
         $(OBJS)\corelib_dropsrc.obj \
@@ -2992,9 +3221,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_bmpbuttn.obj \
         $(OBJS)\corelib_button.obj \
         $(OBJS)\corelib_checkbox.obj \
         $(OBJS)\corelib_bmpbuttn.obj \
         $(OBJS)\corelib_button.obj \
         $(OBJS)\corelib_checkbox.obj \
-       $(OBJS)\corelib_checklst.obj \
         $(OBJS)\corelib_choice.obj \
         $(OBJS)\corelib_colordlg.obj \
         $(OBJS)\corelib_choice.obj \
         $(OBJS)\corelib_colordlg.obj \
+       $(OBJS)\corelib_combo.obj \
         $(OBJS)\corelib_combobox.obj \
         $(OBJS)\corelib_control.obj \
         $(OBJS)\corelib_dialog.obj \
         $(OBJS)\corelib_combobox.obj \
         $(OBJS)\corelib_control.obj \
         $(OBJS)\corelib_dialog.obj \
@@ -3003,7 +3232,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_filedlg.obj \
         $(OBJS)\corelib_frame.obj \
         $(OBJS)\corelib_gauge95.obj \
         $(OBJS)\corelib_filedlg.obj \
         $(OBJS)\corelib_frame.obj \
         $(OBJS)\corelib_gauge95.obj \
-       $(OBJS)\corelib_imaglist.obj \
         $(OBJS)\corelib_iniconf.obj \
         $(OBJS)\corelib_listbox.obj \
         $(OBJS)\corelib_listctrl.obj \
         $(OBJS)\corelib_iniconf.obj \
         $(OBJS)\corelib_listbox.obj \
         $(OBJS)\corelib_listctrl.obj \
@@ -3032,9 +3260,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_tglbtn.obj \
         $(OBJS)\corelib_treectrl.obj \
         $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_tglbtn.obj \
         $(OBJS)\corelib_treectrl.obj \
+       $(OBJS)\corelib_checklst.obj \
         $(OBJS)\corelib_fdrepdlg.obj \
         $(OBJS)\corelib_fontdlg.obj \
         $(OBJS)\corelib_accesscmn.obj \
         $(OBJS)\corelib_fdrepdlg.obj \
         $(OBJS)\corelib_fontdlg.obj \
         $(OBJS)\corelib_accesscmn.obj \
+       $(OBJS)\corelib_anidecod.obj \
         $(OBJS)\corelib_appcmn.obj \
         $(OBJS)\corelib_artprov.obj \
         $(OBJS)\corelib_artstd.obj \
         $(OBJS)\corelib_appcmn.obj \
         $(OBJS)\corelib_artprov.obj \
         $(OBJS)\corelib_artstd.obj \
@@ -3042,6 +3272,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_bookctrl.obj \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
         $(OBJS)\corelib_bookctrl.obj \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
+       $(OBJS)\corelib_clrpickercmn.obj \
+       $(OBJS)\corelib_colourcmn.obj \
+       $(OBJS)\corelib_combocmn.obj \
         $(OBJS)\corelib_cmdproc.obj \
         $(OBJS)\corelib_cmndata.obj \
         $(OBJS)\corelib_containr.obj \
         $(OBJS)\corelib_cmdproc.obj \
         $(OBJS)\corelib_cmndata.obj \
         $(OBJS)\corelib_containr.obj \
@@ -3050,6 +3283,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_ctrlsub.obj \
         $(OBJS)\corelib_datacmn.obj \
         $(OBJS)\corelib_dcbase.obj \
         $(OBJS)\corelib_ctrlsub.obj \
         $(OBJS)\corelib_datacmn.obj \
         $(OBJS)\corelib_dcbase.obj \
+       $(OBJS)\corelib_dcbufcmn.obj \
+       $(OBJS)\corelib_dcgraph.obj \
         $(OBJS)\corelib_dlgcmn.obj \
         $(OBJS)\corelib_dndcmn.obj \
         $(OBJS)\corelib_dobjcmn.obj \
         $(OBJS)\corelib_dlgcmn.obj \
         $(OBJS)\corelib_dndcmn.obj \
         $(OBJS)\corelib_dobjcmn.obj \
@@ -3058,16 +3293,22 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dpycmn.obj \
         $(OBJS)\corelib_dseldlg.obj \
         $(OBJS)\corelib_effects.obj \
         $(OBJS)\corelib_dpycmn.obj \
         $(OBJS)\corelib_dseldlg.obj \
         $(OBJS)\corelib_effects.obj \
+       $(OBJS)\corelib_evtloopcmn.obj \
         $(OBJS)\corelib_fddlgcmn.obj \
         $(OBJS)\corelib_fddlgcmn.obj \
+       $(OBJS)\corelib_filepickercmn.obj \
+       $(OBJS)\corelib_fontpickercmn.obj \
         $(OBJS)\corelib_fldlgcmn.obj \
         $(OBJS)\corelib_fontcmn.obj \
         $(OBJS)\corelib_fldlgcmn.obj \
         $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontenumcmn.obj \
         $(OBJS)\corelib_fontmap.obj \
         $(OBJS)\corelib_fontmap.obj \
+       $(OBJS)\corelib_fontutilcmn.obj \
         $(OBJS)\corelib_framecmn.obj \
         $(OBJS)\corelib_gaugecmn.obj \
         $(OBJS)\corelib_gbsizer.obj \
         $(OBJS)\corelib_gdicmn.obj \
         $(OBJS)\corelib_geometry.obj \
         $(OBJS)\corelib_gifdecod.obj \
         $(OBJS)\corelib_framecmn.obj \
         $(OBJS)\corelib_gaugecmn.obj \
         $(OBJS)\corelib_gbsizer.obj \
         $(OBJS)\corelib_gdicmn.obj \
         $(OBJS)\corelib_geometry.obj \
         $(OBJS)\corelib_gifdecod.obj \
+       $(OBJS)\corelib_graphcmn.obj \
         $(OBJS)\corelib_helpbase.obj \
         $(OBJS)\corelib_iconbndl.obj \
         $(OBJS)\corelib_imagall.obj \
         $(OBJS)\corelib_helpbase.obj \
         $(OBJS)\corelib_iconbndl.obj \
         $(OBJS)\corelib_imagall.obj \
@@ -3080,14 +3321,18 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_imagpcx.obj \
         $(OBJS)\corelib_imagpng.obj \
         $(OBJS)\corelib_imagpnm.obj \
         $(OBJS)\corelib_imagpcx.obj \
         $(OBJS)\corelib_imagpng.obj \
         $(OBJS)\corelib_imagpnm.obj \
+       $(OBJS)\corelib_imagtga.obj \
         $(OBJS)\corelib_imagtiff.obj \
         $(OBJS)\corelib_imagxpm.obj \
         $(OBJS)\corelib_layout.obj \
         $(OBJS)\corelib_lboxcmn.obj \
         $(OBJS)\corelib_imagtiff.obj \
         $(OBJS)\corelib_imagxpm.obj \
         $(OBJS)\corelib_layout.obj \
         $(OBJS)\corelib_lboxcmn.obj \
+       $(OBJS)\corelib_listctrlcmn.obj \
         $(OBJS)\corelib_matrix.obj \
         $(OBJS)\corelib_menucmn.obj \
         $(OBJS)\corelib_nbkbase.obj \
         $(OBJS)\corelib_matrix.obj \
         $(OBJS)\corelib_menucmn.obj \
         $(OBJS)\corelib_nbkbase.obj \
+       $(OBJS)\corelib_overlaycmn.obj \
         $(OBJS)\corelib_paper.obj \
         $(OBJS)\corelib_paper.obj \
+       $(OBJS)\corelib_pickerbase.obj \
         $(OBJS)\corelib_popupcmn.obj \
         $(OBJS)\corelib_prntbase.obj \
         $(OBJS)\corelib_quantize.obj \
         $(OBJS)\corelib_popupcmn.obj \
         $(OBJS)\corelib_prntbase.obj \
         $(OBJS)\corelib_quantize.obj \
@@ -3096,6 +3341,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_rgncmn.obj \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
         $(OBJS)\corelib_rgncmn.obj \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
+       $(OBJS)\corelib_srchcmn.obj \
         $(OBJS)\corelib_statbar.obj \
         $(OBJS)\corelib_stockitem.obj \
         $(OBJS)\corelib_tbarbase.obj \
         $(OBJS)\corelib_statbar.obj \
         $(OBJS)\corelib_stockitem.obj \
         $(OBJS)\corelib_tbarbase.obj \
@@ -3109,11 +3355,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_buttonbar.obj \
         $(OBJS)\corelib_choicdgg.obj \
         $(OBJS)\corelib_choicbkg.obj \
         $(OBJS)\corelib_choicdgg.obj \
         $(OBJS)\corelib_choicbkg.obj \
+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_combog.obj \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \
         $(OBJS)\corelib_listbkg.obj \
         $(OBJS)\corelib_logg.obj \
         $(OBJS)\corelib_numdlgg.obj \
         $(OBJS)\corelib_listbkg.obj \
         $(OBJS)\corelib_logg.obj \
         $(OBJS)\corelib_numdlgg.obj \
@@ -3125,9 +3377,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_selstore.obj \
         $(OBJS)\corelib_spinctlg.obj \
         $(OBJS)\corelib_splitter.obj \
         $(OBJS)\corelib_selstore.obj \
         $(OBJS)\corelib_spinctlg.obj \
         $(OBJS)\corelib_splitter.obj \
+       $(OBJS)\corelib_srchctlg.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_toolbkg.obj \
         $(OBJS)\corelib_treectlg.obj \
         $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_treebkg.obj \
         $(OBJS)\corelib_vlbox.obj \
         $(OBJS)\corelib_vscroll.obj
  !endif
         $(OBJS)\corelib_vlbox.obj \
         $(OBJS)\corelib_vscroll.obj
  !endif
@@ -3156,8 +3411,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontutil.obj \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
         $(OBJS)\corelib_fontutil.obj \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
+       $(OBJS)\corelib_gdiplus.obj \
+       $(OBJS)\corelib_graphics.obj \
         $(OBJS)\corelib_gsockmsw.obj \
         $(OBJS)\corelib_icon.obj \
         $(OBJS)\corelib_gsockmsw.obj \
         $(OBJS)\corelib_icon.obj \
+       $(OBJS)\corelib_imaglist.obj \
         $(OBJS)\corelib_minifram.obj \
         $(OBJS)\corelib_dataobj.obj \
         $(OBJS)\corelib_dropsrc.obj \
         $(OBJS)\corelib_minifram.obj \
         $(OBJS)\corelib_dataobj.obj \
         $(OBJS)\corelib_dropsrc.obj \
@@ -3187,7 +3445,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fdrepdlg.obj \
         $(OBJS)\corelib_filedlgg.obj \
         $(OBJS)\corelib_fontdlgg.obj \
         $(OBJS)\corelib_fdrepdlg.obj \
         $(OBJS)\corelib_filedlgg.obj \
         $(OBJS)\corelib_fontdlgg.obj \
-       $(OBJS)\corelib_imaglist.obj \
         $(OBJS)\corelib_listctrl.obj \
         $(OBJS)\corelib_mdig.obj \
         $(OBJS)\corelib_msgdlgg.obj \
         $(OBJS)\corelib_listctrl.obj \
         $(OBJS)\corelib_mdig.obj \
         $(OBJS)\corelib_msgdlgg.obj \
@@ -3222,15 +3479,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_statline.obj \
         $(OBJS)\corelib_stattext.obj \
         $(OBJS)\corelib_statusbr.obj \
         $(OBJS)\corelib_statline.obj \
         $(OBJS)\corelib_stattext.obj \
         $(OBJS)\corelib_statusbr.obj \
+       $(OBJS)\corelib_stdrend.obj \
         $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_textctrl.obj \
+       $(OBJS)\corelib_tglbtn.obj \
         $(OBJS)\corelib_theme.obj \
         $(OBJS)\corelib_toolbar.obj \
         $(OBJS)\corelib_topluniv.obj \
         $(OBJS)\corelib_winuniv.obj \
         $(OBJS)\corelib_gtk.obj \
         $(OBJS)\corelib_metal.obj \
         $(OBJS)\corelib_theme.obj \
         $(OBJS)\corelib_toolbar.obj \
         $(OBJS)\corelib_topluniv.obj \
         $(OBJS)\corelib_winuniv.obj \
         $(OBJS)\corelib_gtk.obj \
         $(OBJS)\corelib_metal.obj \
+       $(OBJS)\corelib_mono.obj \
         $(OBJS)\corelib_win32.obj \
         $(OBJS)\corelib_accesscmn.obj \
         $(OBJS)\corelib_win32.obj \
         $(OBJS)\corelib_accesscmn.obj \
+       $(OBJS)\corelib_anidecod.obj \
         $(OBJS)\corelib_appcmn.obj \
         $(OBJS)\corelib_artprov.obj \
         $(OBJS)\corelib_artstd.obj \
         $(OBJS)\corelib_appcmn.obj \
         $(OBJS)\corelib_artprov.obj \
         $(OBJS)\corelib_artstd.obj \
@@ -3238,6 +3499,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_bookctrl.obj \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
         $(OBJS)\corelib_bookctrl.obj \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
+       $(OBJS)\corelib_clrpickercmn.obj \
+       $(OBJS)\corelib_colourcmn.obj \
+       $(OBJS)\corelib_combocmn.obj \
         $(OBJS)\corelib_cmdproc.obj \
         $(OBJS)\corelib_cmndata.obj \
         $(OBJS)\corelib_containr.obj \
         $(OBJS)\corelib_cmdproc.obj \
         $(OBJS)\corelib_cmndata.obj \
         $(OBJS)\corelib_containr.obj \
@@ -3246,6 +3510,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_ctrlsub.obj \
         $(OBJS)\corelib_datacmn.obj \
         $(OBJS)\corelib_dcbase.obj \
         $(OBJS)\corelib_ctrlsub.obj \
         $(OBJS)\corelib_datacmn.obj \
         $(OBJS)\corelib_dcbase.obj \
+       $(OBJS)\corelib_dcbufcmn.obj \
+       $(OBJS)\corelib_dcgraph.obj \
         $(OBJS)\corelib_dlgcmn.obj \
         $(OBJS)\corelib_dndcmn.obj \
         $(OBJS)\corelib_dobjcmn.obj \
         $(OBJS)\corelib_dlgcmn.obj \
         $(OBJS)\corelib_dndcmn.obj \
         $(OBJS)\corelib_dobjcmn.obj \
@@ -3254,16 +3520,22 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dpycmn.obj \
         $(OBJS)\corelib_dseldlg.obj \
         $(OBJS)\corelib_effects.obj \
         $(OBJS)\corelib_dpycmn.obj \
         $(OBJS)\corelib_dseldlg.obj \
         $(OBJS)\corelib_effects.obj \
+       $(OBJS)\corelib_evtloopcmn.obj \
         $(OBJS)\corelib_fddlgcmn.obj \
         $(OBJS)\corelib_fddlgcmn.obj \
+       $(OBJS)\corelib_filepickercmn.obj \
+       $(OBJS)\corelib_fontpickercmn.obj \
         $(OBJS)\corelib_fldlgcmn.obj \
         $(OBJS)\corelib_fontcmn.obj \
         $(OBJS)\corelib_fldlgcmn.obj \
         $(OBJS)\corelib_fontcmn.obj \
+       $(OBJS)\corelib_fontenumcmn.obj \
         $(OBJS)\corelib_fontmap.obj \
         $(OBJS)\corelib_fontmap.obj \
+       $(OBJS)\corelib_fontutilcmn.obj \
         $(OBJS)\corelib_framecmn.obj \
         $(OBJS)\corelib_gaugecmn.obj \
         $(OBJS)\corelib_gbsizer.obj \
         $(OBJS)\corelib_gdicmn.obj \
         $(OBJS)\corelib_geometry.obj \
         $(OBJS)\corelib_gifdecod.obj \
         $(OBJS)\corelib_framecmn.obj \
         $(OBJS)\corelib_gaugecmn.obj \
         $(OBJS)\corelib_gbsizer.obj \
         $(OBJS)\corelib_gdicmn.obj \
         $(OBJS)\corelib_geometry.obj \
         $(OBJS)\corelib_gifdecod.obj \
+       $(OBJS)\corelib_graphcmn.obj \
         $(OBJS)\corelib_helpbase.obj \
         $(OBJS)\corelib_iconbndl.obj \
         $(OBJS)\corelib_imagall.obj \
         $(OBJS)\corelib_helpbase.obj \
         $(OBJS)\corelib_iconbndl.obj \
         $(OBJS)\corelib_imagall.obj \
@@ -3276,14 +3548,18 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_imagpcx.obj \
         $(OBJS)\corelib_imagpng.obj \
         $(OBJS)\corelib_imagpnm.obj \
         $(OBJS)\corelib_imagpcx.obj \
         $(OBJS)\corelib_imagpng.obj \
         $(OBJS)\corelib_imagpnm.obj \
+       $(OBJS)\corelib_imagtga.obj \
         $(OBJS)\corelib_imagtiff.obj \
         $(OBJS)\corelib_imagxpm.obj \
         $(OBJS)\corelib_layout.obj \
         $(OBJS)\corelib_lboxcmn.obj \
         $(OBJS)\corelib_imagtiff.obj \
         $(OBJS)\corelib_imagxpm.obj \
         $(OBJS)\corelib_layout.obj \
         $(OBJS)\corelib_lboxcmn.obj \
+       $(OBJS)\corelib_listctrlcmn.obj \
         $(OBJS)\corelib_matrix.obj \
         $(OBJS)\corelib_menucmn.obj \
         $(OBJS)\corelib_nbkbase.obj \
         $(OBJS)\corelib_matrix.obj \
         $(OBJS)\corelib_menucmn.obj \
         $(OBJS)\corelib_nbkbase.obj \
+       $(OBJS)\corelib_overlaycmn.obj \
         $(OBJS)\corelib_paper.obj \
         $(OBJS)\corelib_paper.obj \
+       $(OBJS)\corelib_pickerbase.obj \
         $(OBJS)\corelib_popupcmn.obj \
         $(OBJS)\corelib_prntbase.obj \
         $(OBJS)\corelib_quantize.obj \
         $(OBJS)\corelib_popupcmn.obj \
         $(OBJS)\corelib_prntbase.obj \
         $(OBJS)\corelib_quantize.obj \
@@ -3292,6 +3568,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_rgncmn.obj \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
         $(OBJS)\corelib_rgncmn.obj \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
+       $(OBJS)\corelib_srchcmn.obj \
         $(OBJS)\corelib_statbar.obj \
         $(OBJS)\corelib_stockitem.obj \
         $(OBJS)\corelib_tbarbase.obj \
         $(OBJS)\corelib_statbar.obj \
         $(OBJS)\corelib_stockitem.obj \
         $(OBJS)\corelib_tbarbase.obj \
@@ -3305,11 +3582,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_buttonbar.obj \
         $(OBJS)\corelib_choicdgg.obj \
         $(OBJS)\corelib_choicbkg.obj \
         $(OBJS)\corelib_choicdgg.obj \
         $(OBJS)\corelib_choicbkg.obj \
+       $(OBJS)\corelib_clrpickerg.obj \
+       $(OBJS)\corelib_collpaneg.obj \
+       $(OBJS)\corelib_combog.obj \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_filepickerg.obj \
+       $(OBJS)\corelib_fontpickerg.obj \
         $(OBJS)\corelib_listbkg.obj \
         $(OBJS)\corelib_logg.obj \
         $(OBJS)\corelib_numdlgg.obj \
         $(OBJS)\corelib_listbkg.obj \
         $(OBJS)\corelib_logg.obj \
         $(OBJS)\corelib_numdlgg.obj \
@@ -3321,43 +3604,25 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_selstore.obj \
         $(OBJS)\corelib_spinctlg.obj \
         $(OBJS)\corelib_splitter.obj \
         $(OBJS)\corelib_selstore.obj \
         $(OBJS)\corelib_spinctlg.obj \
         $(OBJS)\corelib_splitter.obj \
+       $(OBJS)\corelib_srchctlg.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_toolbkg.obj \
         $(OBJS)\corelib_treectlg.obj \
         $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_treebkg.obj \
         $(OBJS)\corelib_vlbox.obj \
         $(OBJS)\corelib_vscroll.obj
  !endif
         $(OBJS)\corelib_vlbox.obj \
         $(OBJS)\corelib_vscroll.obj
  !endif
+!if "$(SHARED)" == "1"
+____wxcore_namedll_DEP = $(__coredll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxcore_namelib_DEP = $(__corelib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __advdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  __advdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_189_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_189_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_189_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_189_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_189_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_189_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_190 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_190 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_190 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_195 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_195 = D
  !endif
@@ -3366,19 +3631,29 @@ __RUNTIME_LIBS_195 = $(__THREADSFLAG)
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_animatecmn.obj \
+       $(OBJS)\advdll_datavcmn.obj \
+       $(OBJS)\advdll_hyperlnkcmn.obj \
+       $(OBJS)\advdll_aboutdlgg.obj \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_bmpcboxg.obj \
         $(OBJS)\advdll_calctrl.obj \
         $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datavgen.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_hyperlinkg.obj \
         $(OBJS)\advdll_laywin.obj \
         $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_odcombo.obj \
         $(OBJS)\advdll_propdlg.obj \
         $(OBJS)\advdll_sashwin.obj \
         $(OBJS)\advdll_splash.obj \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
         $(OBJS)\advdll_propdlg.obj \
         $(OBJS)\advdll_sashwin.obj \
         $(OBJS)\advdll_splash.obj \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_aboutdlg.obj \
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_taskbar.obj \
         $(OBJS)\advdll_joystick.obj \
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_taskbar.obj \
         $(OBJS)\advdll_joystick.obj \
@@ -3386,19 +3661,29 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\advdll_animatecmn.obj \
+       $(OBJS)\advdll_datavcmn.obj \
+       $(OBJS)\advdll_hyperlnkcmn.obj \
+       $(OBJS)\advdll_aboutdlgg.obj \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_bmpcboxg.obj \
         $(OBJS)\advdll_calctrl.obj \
         $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datavgen.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
+       $(OBJS)\advdll_hyperlinkg.obj \
         $(OBJS)\advdll_laywin.obj \
         $(OBJS)\advdll_laywin.obj \
+       $(OBJS)\advdll_odcombo.obj \
         $(OBJS)\advdll_propdlg.obj \
         $(OBJS)\advdll_sashwin.obj \
         $(OBJS)\advdll_splash.obj \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
         $(OBJS)\advdll_propdlg.obj \
         $(OBJS)\advdll_sashwin.obj \
         $(OBJS)\advdll_splash.obj \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
+       $(OBJS)\advdll_aboutdlg.obj \
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_taskbar.obj \
         $(OBJS)\advdll_joystick.obj
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_taskbar.obj \
         $(OBJS)\advdll_joystick.obj
@@ -3407,24 +3692,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
  __advlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  !endif
  __advlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_202_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_202_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_202_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_203 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_203 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_203 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_208 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_208 = D
  !endif
@@ -3433,19 +3700,29 @@ __RUNTIME_LIBS_208 = $(__THREADSFLAG)
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_animatecmn.obj \
+       $(OBJS)\advlib_datavcmn.obj \
+       $(OBJS)\advlib_hyperlnkcmn.obj \
+       $(OBJS)\advlib_aboutdlgg.obj \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_bmpcboxg.obj \
         $(OBJS)\advlib_calctrl.obj \
         $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datavgen.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_hyperlinkg.obj \
         $(OBJS)\advlib_laywin.obj \
         $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_odcombo.obj \
         $(OBJS)\advlib_propdlg.obj \
         $(OBJS)\advlib_sashwin.obj \
         $(OBJS)\advlib_splash.obj \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
         $(OBJS)\advlib_propdlg.obj \
         $(OBJS)\advlib_sashwin.obj \
         $(OBJS)\advlib_splash.obj \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_aboutdlg.obj \
         $(OBJS)\advlib_sound.obj \
         $(OBJS)\advlib_taskbar.obj \
         $(OBJS)\advlib_joystick.obj \
         $(OBJS)\advlib_sound.obj \
         $(OBJS)\advlib_taskbar.obj \
         $(OBJS)\advlib_joystick.obj \
@@ -3453,53 +3730,42 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\advlib_animatecmn.obj \
+       $(OBJS)\advlib_datavcmn.obj \
+       $(OBJS)\advlib_hyperlnkcmn.obj \
+       $(OBJS)\advlib_aboutdlgg.obj \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_bmpcboxg.obj \
         $(OBJS)\advlib_calctrl.obj \
         $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datavgen.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
+       $(OBJS)\advlib_hyperlinkg.obj \
         $(OBJS)\advlib_laywin.obj \
         $(OBJS)\advlib_laywin.obj \
+       $(OBJS)\advlib_odcombo.obj \
         $(OBJS)\advlib_propdlg.obj \
         $(OBJS)\advlib_sashwin.obj \
         $(OBJS)\advlib_splash.obj \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
         $(OBJS)\advlib_propdlg.obj \
         $(OBJS)\advlib_sashwin.obj \
         $(OBJS)\advlib_splash.obj \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
+       $(OBJS)\advlib_aboutdlg.obj \
         $(OBJS)\advlib_sound.obj \
         $(OBJS)\advlib_taskbar.obj \
         $(OBJS)\advlib_joystick.obj
  !endif
         $(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_216_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_216_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_216_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_216_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_216_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_216_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_217 = 
+!if "$(SHARED)" == "1"
+____wxadv_namedll_DEP = $(__advdll___depname)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_217 = d
+!if "$(SHARED)" == "0"
+____wxadv_namelib_DEP = $(__advlib___depname)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_217 = $(__DEBUGINFO_34)
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
+__mediadll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_222 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_222 = D
@@ -3507,65 +3773,26 @@ __RUNTIME_LIBS_222 = D
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_222 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_222 = $(__THREADSFLAG)
  !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
  __medialib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  !endif
  __medialib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_229_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_229_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_229_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_230 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_230 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_230 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_235 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_235 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_235 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_235 = $(__THREADSFLAG)
  !endif
+!if "$(SHARED)" == "1"
+____wxmedia_namedll_DEP = $(__mediadll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxmedia_namelib_DEP = $(__medialib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
  __odbcdll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
  __odbcdll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_243_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_243_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_243_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_243_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_243_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_243_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_244 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_244 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_244 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_249 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_249 = D
  !endif
@@ -3576,24 +3803,6 @@ __RUNTIME_LIBS_249 = $(__THREADSFLAG)
  __odbclib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  !endif
  __odbclib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_256_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_256_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_256_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_257 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_257 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_257 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_262 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_262 = D
  !endif
@@ -3604,33 +3813,6 @@ __RUNTIME_LIBS_262 = $(__THREADSFLAG)
  __dbgriddll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
  !endif
  __dbgriddll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_270_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_270_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_270_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_270_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_270_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_270_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_271 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_271 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_271 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_276 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_276 = D
  !endif
@@ -3641,61 +3823,22 @@ __RUNTIME_LIBS_276 = $(__THREADSFLAG)
  __dbgridlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  !endif
  __dbgridlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_283_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_283_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_283_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_284 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_284 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_284 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_289 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_289 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_289 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_289 = $(__THREADSFLAG)
  !endif
+!if "$(SHARED)" == "1"
+____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmldll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmldll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_297_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_297_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_297_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_297_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_297_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_297_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_298 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_298 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_298 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_303 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_303 = D
  !endif
@@ -3706,61 +3849,22 @@ __RUNTIME_LIBS_303 = $(__THREADSFLAG)
  __htmllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
  __htmllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_310_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_310_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_310_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_311 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_311 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_311 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_316 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_316 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_316 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_316 = $(__THREADSFLAG)
  !endif
+!if "$(SHARED)" == "1"
+____wxhtml_namedll_DEP = $(__htmldll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxhtml_namelib_DEP = $(__htmllib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  __qadll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  __qadll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_324_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_324_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_324_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_324_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_324_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_324_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_325 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_325 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_325 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_330 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_330 = D
  !endif
@@ -3771,61 +3875,22 @@ __RUNTIME_LIBS_330 = $(__THREADSFLAG)
  __qalib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
  !endif
  __qalib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_337_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_337_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_337_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_338 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_338 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_338 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_343 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_343 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_343 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_343 = $(__THREADSFLAG)
  !endif
+!if "$(SHARED)" == "1"
+____wxqa_namedll_DEP = $(__qadll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxqa_namelib_DEP = $(__qalib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __xmldll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  __xmldll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_351_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_351_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_351_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_351_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_351_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_351_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_352 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_352 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_352 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_357 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_357 = D
  !endif
@@ -3836,61 +3901,22 @@ __RUNTIME_LIBS_357 = $(__THREADSFLAG)
  __xmllib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  !endif
  __xmllib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_364_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_364_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_364_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_365 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_365 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_365 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_370 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_370 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_370 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS_370 = $(__THREADSFLAG)
  !endif
+!if "$(SHARED)" == "1"
+____wxxml_namedll_DEP = $(__xmldll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxxml_namelib_DEP = $(__xmllib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
  __xrcdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
  !endif
  !if "$(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_378_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_378_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_378_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_378_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_378_p_1 = /d _DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_378_p_1 = $(____DEBUGINFO_4)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_379 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_379 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_379 = $(__DEBUGINFO_34)
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_384 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  __RUNTIME_LIBS_384 = D
  !endif
@@ -3901,66 +3927,79 @@ __RUNTIME_LIBS_384 = $(__THREADSFLAG)
  __xrclib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  !endif
  __xrclib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_391_p = 
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_397 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_391_p = /D_DEBUG
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_397 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_391_p = $(____DEBUGINFO)
+!if "$(SHARED)" == "1"
+____wxxrc_namedll_DEP = $(__xrcdll___depname)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_392 = 
+!if "$(SHARED)" == "0"
+____wxxrc_namelib_DEP = $(__xrclib___depname)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_392 = d
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
+__auidll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_392 = $(__DEBUGINFO_34)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_411 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_411 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
+__auilib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_397 = D
+__RUNTIME_LIBS_424 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_397 = $(__THREADSFLAG)
+__RUNTIME_LIBS_424 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-__gldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
+!if "$(SHARED)" == "1"
+____wxaui_namedll_DEP = $(__auidll___depname)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_405_p = 
+!if "$(SHARED)" == "0"
+____wxaui_namelib_DEP = $(__auilib___depname)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_405_p = /D_DEBUG
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
+__richtextdll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_405_p = $(____DEBUGINFO)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_438 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_405_p_1 = 
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_438 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_405_p_1 = /d _DEBUG
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1"
+__richtextlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_405_p_1 = $(____DEBUGINFO_4)
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_451 = D
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_406 = 
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_451 = $(__THREADSFLAG)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_406 = d
+!if "$(SHARED)" == "1"
+____wxrichtext_namedll_DEP = $(__richtextdll___depname)
  !endif
  !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_406 = $(__DEBUGINFO_34)
+!if "$(SHARED)" == "0"
+____wxrichtext_namelib_DEP = $(__richtextlib___depname)
+!endif
+!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
+__gldll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_411 = D
+__RUNTIME_LIBS_465 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_411 = $(__THREADSFLAG)
+__RUNTIME_LIBS_465 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_CORE_p = \
  !endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_CORE_p = \
@@ -3974,84 +4013,79 @@ __WXLIBGLDEP_BASE_p = \
  __WXLIB_MONO_p = \
         wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  __WXLIB_MONO_p = \
         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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_418_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_418_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_418_p = $(____DEBUGINFO)
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_419 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_419 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_419 = $(__DEBUGINFO_34)
+!if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
+__gllib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_424 = D
+__RUNTIME_LIBS_478 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_424 = $(__THREADSFLAG)
+__RUNTIME_LIBS_478 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
+__htmldll_library_link_DEP = $(__htmldll___depname)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
+__htmldll_library_link_LIBR = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_32 = /DEBUG
+__DEBUGINFO_4 = /DEBUG
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_32 = 
+__DEBUGINFO_4 = 
  !endif
  !if "$(DEBUG_INFO)" == "0"
  !endif
  !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_32 = 
+__DEBUGINFO_4 = 
  !endif
  !if "$(DEBUG_INFO)" == "1"
  !endif
  !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_32 = /DEBUG
+__DEBUGINFO_4 = /DEBUG
  !endif
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_4 = /d _DEBUG
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_4 = /d _DEBUG
  !endif
  !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_4 = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_4 = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_4 = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_4 = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_4 = /d _DEBUG
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_4 = /d _DEBUG
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_55 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_63 = /d __NO_VC_CRTDBG__
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_55 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_63 = /d __NO_VC_CRTDBG__
  !endif
  !if "$(WXUNIV)" == "1"
  !endif
  !if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_49 = /d __WXUNIVERSAL__
+__WXUNIV_DEFINE_p_58 = /d __WXUNIVERSAL__
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_49 = /d __WXDEBUG__
+__DEBUG_DEFINE_p_57 = /d __WXDEBUG__
  !endif
  !if "$(DEBUG_FLAG)" == "1"
  !endif
  !if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_49 = /d __WXDEBUG__
+__DEBUG_DEFINE_p_57 = /d __WXDEBUG__
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_49 = /d wxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_57 = /d wxNO_EXCEPTIONS
  !endif
  !if "$(USE_RTTI)" == "0"
  !endif
  !if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_49 = /d wxNO_RTTI
+__RTTI_DEFINE_p_57 = /d wxNO_RTTI
  !endif
  !if "$(USE_THREADS)" == "0"
  !endif
  !if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_49 = /d wxNO_THREADS
+__THREAD_DEFINE_p_57 = /d wxNO_THREADS
  !endif
  !if "$(UNICODE)" == "1"
  !endif
  !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_50 = /d _UNICODE
+__UNICODE_DEFINE_p_58 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_57 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_57 = /d wxUSE_GRAPHICS_CONTEXT=1
  !endif
  !if "$(USE_GUI)" == "1"
  __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
  !endif
  !if "$(USE_GUI)" == "1"
  __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -4065,6 +4099,9 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
  !if "$(MSLU)" == "1"
  __UNICOWS_LIB_p = unicows.lib
  !endif
  !if "$(MSLU)" == "1"
  __UNICOWS_LIB_p = unicows.lib
  !endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
  __DEBUGINFO = /Zi
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
  __DEBUGINFO = /Zi
  !endif
@@ -4077,29 +4114,29 @@ __DEBUGINFO =
  !if "$(DEBUG_INFO)" == "1"
  __DEBUGINFO = /Zi
  !endif
  !if "$(DEBUG_INFO)" == "1"
  __DEBUGINFO = /Zi
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = /D_DEBUG
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG
  !endif
  !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO = /D_DEBUG
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME = /D_DEBUG
  !endif
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_34 = d
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
  !endif
  !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_34 = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_34 = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME = 
  !endif
  !endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_34 = d
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
  !endif
  !if "$(BUILD)" == "debug"
  __OPTIMIZEFLAG = /Od
  !endif
  !if "$(BUILD)" == "debug"
  __OPTIMIZEFLAG = /Od
@@ -4152,6 +4189,12 @@ __THREAD_DEFINE_p = /DwxNO_THREADS
  !if "$(UNICODE)" == "1"
  __UNICODE_DEFINE_p = /D_UNICODE
  !endif
  !if "$(UNICODE)" == "1"
  __UNICODE_DEFINE_p = /D_UNICODE
  !endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
+!endif
  !if "$(WXUNIV)" == "0"
  __SETUP_H_SUBDIR_FILENAMES = msw
  !endif
  !if "$(WXUNIV)" == "0"
  __SETUP_H_SUBDIR_FILENAMES = msw
  !endif
@@ -4166,7 +4209,7 @@ $(OBJS):
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
  
  clean: 
         -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
  
  clean: 
         -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -4238,6 +4281,16 @@ clean:
         -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)_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)_aui_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.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_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
@@ -4247,24 +4300,24 @@ clean:
         $(MAKE) -f makefile.vc $(MAKEARGS) clean
         cd $(MAKEDIR)
  
         $(MAKE) -f makefile.vc $(MAKEARGS) clean
         cd $(MAKEDIR)
  
-setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
+setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h
  
  $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS)
         if exist $@ del $@
  
  $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXREGEX_OBJECTS)
  <<
  
  $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
         if exist $@ del $@
         $(WXREGEX_OBJECTS)
  <<
  
  $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXZLIB_OBJECTS)
  <<
  
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS)
         if exist $@ del $@
         $(WXZLIB_OBJECTS)
  <<
  
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXPNG_OBJECTS)
  <<
  !endif
         $(WXPNG_OBJECTS)
  <<
  !endif
@@ -4272,7 +4325,7 @@ $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS)
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
         if exist $@ del $@
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXJPEG_OBJECTS)
  <<
  !endif
         $(WXJPEG_OBJECTS)
  <<
  !endif
@@ -4280,208 +4333,286 @@ $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS)
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib: $(WXTIFF_OBJECTS)
         if exist $@ del $@
  !if "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib: $(WXTIFF_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXTIFF_OBJECTS)
  <<
  !endif
  
  $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
         if exist $@ del $@
         $(WXTIFF_OBJECTS)
  <<
  !endif
  
  $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(WXEXPAT_OBJECTS)
  <<
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
         $(WXEXPAT_OBJECTS)
  <<
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(OBJS)\monodll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib      /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib     /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\monolib_dummy.obj  $(MONOLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\monolib_dummy.obj  $(MONOLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(MONOLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
         $(MONOLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(OBJS)\basedll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(BASEDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(BASELIB_OBJECTS)
  <<
  !endif
  
         $(BASELIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0"
+wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(OBJS)\netdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(NETDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(NETLIB_OBJECTS)
  <<
  !endif
  
         $(NETLIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0"
+wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(OBJS)\coredll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib: $(OBJS)\corelib_dummy.obj  $(CORELIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib: $(OBJS)\corelib_dummy.obj  $(CORELIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(CORELIB_OBJECTS)
  <<
  !endif
  
         $(CORELIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1"
+wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(OBJS)\advdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib: $(OBJS)\advlib_dummy.obj  $(ADVLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib: $(OBJS)\advlib_dummy.obj  $(ADVLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(ADVLIB_OBJECTS)
  <<
  !endif
  
         $(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) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(MEDIADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1"
+wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(MEDIADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  <<
  !endif
  
  <<
  !endif
  
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj  $(MEDIALIB_OBJECTS)
         if exist $@ del $@
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj  $(MEDIALIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(MEDIALIB_OBJECTS)
  <<
  !endif
  
         $(MEDIALIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
+wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(ODBCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\odbcdll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(ODBCDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(ODBCLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
         $(ODBCLIB_OBJECTS)
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\dbgriddll_version.res $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(DBGRIDLIB_OBJECTS)
  <<
  !endif
  
         $(DBGRIDLIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+wxdbgrid: $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  !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) $(OBJS)\htmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib: $(OBJS)\htmllib_dummy.obj  $(HTMLLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib: $(OBJS)\htmllib_dummy.obj  $(HTMLLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(HTMLLIB_OBJECTS)
  <<
  !endif
  
         $(HTMLLIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(USE_HTML)" == "1"
+wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(QADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(QADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib: $(OBJS)\qalib_dummy.obj  $(QALIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib: $(OBJS)\qalib_dummy.obj  $(QALIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(QALIB_OBJECTS)
  <<
  !endif
  
         $(QALIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(USE_QA)" == "1"
+wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(XMLDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(XMLLIB_OBJECTS)
  <<
  !endif
  
         $(XMLLIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0"
+wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
  !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) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(XRCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(XRCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__htmldll_library_link_LIBR) $(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 $@
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib: $(OBJS)\xrclib_dummy.obj  $(XRCLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(XRCLIB_OBJECTS)
  <<
  !endif
  
         $(XRCLIB_OBJECTS)
  <<
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(USE_XRC)" == "1"
+wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(AUIDLL_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) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\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)_aui.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib: $(OBJS)\auilib_dummy.obj  $(AUILIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(AUILIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_AUI)" == "1"
+wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(RICHTEXTDLL_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) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib: $(OBJS)\richtextlib_dummy.obj  $(RICHTEXTLIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(RICHTEXTLIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_RICHTEXT)" == "1"
+wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
+!endif
+
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(OBJS)\gldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
+       $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  <<
  !endif
  
  !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib: $(OBJS)\gllib_dummy.obj  $(GLLIB_OBJECTS)
         if exist $@ del $@
  <<
  !endif
  
  !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib: $(OBJS)\gllib_dummy.obj  $(GLLIB_OBJECTS)
         if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
+       link /LIB /NOLOGO /OUT:$@ @<<
         $(GLLIB_OBJECTS)
  <<
  !endif
         $(GLLIB_OBJECTS)
  <<
  !endif
@@ -4506,10 +4637,16 @@ $(SETUPHDIR)\wx: $(SETUPHDIR)
  $(SETUPHDIR)\wx\setup.h: 
         if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
  
  $(SETUPHDIR)\wx\setup.h: 
         if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
  
+$(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx
+       if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw
+
+$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h
+       $(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+
  build_cfg_file: $(SETUPHDIR)
         @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
  build_cfg_file: $(SETUPHDIR)
         @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
-       @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
-       @echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE)
+       @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
         @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
         @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
         @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
         @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
         @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
         @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -4526,9 +4663,11 @@ build_cfg_file: $(SETUPHDIR)
         @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
         @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
         @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
         @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
         @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
         @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
+       @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
         @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
         @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
         @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
         @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
         @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
         @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
+       @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
         @echo COMPILER=vc >>$(BUILD_CFG_FILE)
         @echo CC=$(CC) >>$(BUILD_CFG_FILE)
         @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
         @echo COMPILER=vc >>$(BUILD_CFG_FILE)
         @echo CC=$(CC) >>$(BUILD_CFG_FILE)
         @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
@@ -4810,6 +4949,9 @@ $(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\tif_dumpmode.c
  $(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\tif_error.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
  $(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\tif_error.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
+$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\tif_extension.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
+
  $(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\tif_fax3.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
  $(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\tif_fax3.c
         $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) $**
  
@@ -4885,18 +5027,27 @@ $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c
  $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c
         $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) $**
  
  $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c
         $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) $**
  
-$(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_81_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL $**
  
  $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  
  $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.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_archive.obj: ..\..\src\common\archive.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_arrstr.obj: ..\..\src\common\arrstr.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_clntdata.obj: ..\..\src\common\clntdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4906,6 +5057,9 @@ $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
  $(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4936,6 +5090,9 @@ $(OBJS)\monodll_ffile.obj: ..\..\src\common\ffile.cpp
  $(OBJS)\monodll_file.obj: ..\..\src\common\file.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_file.obj: ..\..\src\common\file.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_fileback.obj: ..\..\src\common\fileback.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_fileconf.obj: ..\..\src\common\fileconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_fileconf.obj: ..\..\src\common\fileconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -4948,10 +5105,19 @@ $(OBJS)\monodll_filename.obj: ..\..\src\common\filename.cpp
  $(OBJS)\monodll_filesys.obj: ..\..\src\common\filesys.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_filesys.obj: ..\..\src\common\filesys.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_filtall.obj: ..\..\src\common\filtall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_filtfind.obj: ..\..\src\common\filtfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp
@@ -4993,6 +5159,12 @@ $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp
  $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_platinfo.obj: ..\..\src\common\platinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5017,9 +5189,18 @@ $(OBJS)\monodll_stream.obj: ..\..\src\common\stream.cpp
  $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5032,6 +5213,9 @@ $(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_txtstrm.obj: ..\..\src\common\txtstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5041,7 +5225,10 @@ $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
  $(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_wxchar.obj: ..\..\src\common\wxchar.cpp
+$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
@@ -5077,6 +5264,9 @@ $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
  $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5161,6 +5351,9 @@ $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
  $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5215,9 +5408,6 @@ $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
  $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
  $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5272,6 +5462,9 @@ $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
  $(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5290,6 +5483,9 @@ $(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
  $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5299,7 +5495,16 @@ $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
  $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
@@ -5311,9 +5516,15 @@ $(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
  $(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5383,12 +5594,18 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
  $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
-$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5407,12 +5624,21 @@ $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
  $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5422,15 +5648,27 @@ $(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
  $(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5446,6 +5684,9 @@ $(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
  $(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.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_odcombo.obj: ..\..\src\xrc\xh_odcombo.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_panel.obj: ..\..\src\xrc\xh_panel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5461,6 +5702,9 @@ $(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
  $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.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_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.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_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5500,6 +5744,9 @@ $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
  $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
+$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
  $(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5512,6 +5759,48 @@ $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
  $(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.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_framemanager.obj: ..\..\src\aui\framemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.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_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -5633,6 +5922,16 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5643,6 +5942,11 @@ $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5813,16 +6117,6 @@ $(OBJS)\monodll_checkbox.obj: ..\..\src\univ\checkbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5863,16 +6157,6 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_imaglist.obj: ..\..\src\generic\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6003,6 +6287,26 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6018,6 +6322,11 @@ $(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6029,27 +6338,42 @@ $(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
+$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+$(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
@@ -6093,6 +6417,16 @@ $(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6133,11 +6467,26 @@ $(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6148,11 +6497,21 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6183,6 +6542,11 @@ $(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6243,6 +6607,11 @@ $(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6263,6 +6632,11 @@ $(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6278,11 +6652,21 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6323,6 +6707,11 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6388,6 +6777,11 @@ $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6398,6 +6792,21 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6413,6 +6822,16 @@ $(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6468,6 +6887,11 @@ $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6478,11 +6902,21 @@ $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6493,11 +6927,46 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.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_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6523,11 +6992,21 @@ $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.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_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6558,6 +7037,11 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6573,15 +7057,24 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
-$(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\monolib_dummy.obj: ..\..\src\common\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) $**
  
         $(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_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.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_archive.obj: ..\..\src\common\archive.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.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_clntdata.obj: ..\..\src\common\clntdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6591,6 +7084,9 @@ $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
  $(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6621,6 +7117,9 @@ $(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp
  $(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6633,10 +7132,19 @@ $(OBJS)\monolib_filename.obj: ..\..\src\common\filename.cpp
  $(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_filtall.obj: ..\..\src\common\filtall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp
@@ -6678,6 +7186,12 @@ $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp
  $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_platinfo.obj: ..\..\src\common\platinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6702,9 +7216,18 @@ $(OBJS)\monolib_stream.obj: ..\..\src\common\stream.cpp
  $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6717,6 +7240,9 @@ $(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_txtstrm.obj: ..\..\src\common\txtstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6726,7 +7252,10 @@ $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
  $(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_wxchar.obj: ..\..\src\common\wxchar.cpp
+$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
@@ -6762,6 +7291,9 @@ $(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
  $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6846,6 +7378,9 @@ $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
  $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6900,9 +7435,6 @@ $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
  $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
  $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6957,6 +7489,9 @@ $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
  $(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6975,6 +7510,9 @@ $(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
  $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -6984,7 +7522,16 @@ $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
  $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
@@ -6996,9 +7543,15 @@ $(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
  $(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -7068,12 +7621,18 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
  $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.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) $**
  
         $(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_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.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_bttn.obj: ..\..\src\xrc\xh_bttn.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) $**
  
@@ -7092,12 +7651,21 @@ $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
  $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -7107,15 +7675,27 @@ $(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
  $(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
+$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
  $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -7131,70 +7711,121 @@ $(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
  $(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
+$(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
+$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp
+$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
+$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
+$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
+$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp
+$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp
+$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp
+$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp
+$(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp
+$(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp
+$(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
+$(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
+$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
+$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
+$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
+$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
+$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
-$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
+$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
@@ -7318,6 +7949,16 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7328,6 +7969,11 @@ $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7498,16 +8144,6 @@ $(OBJS)\monolib_checkbox.obj: ..\..\src\univ\checkbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7548,16 +8184,6 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_imaglist.obj: ..\..\src\generic\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7688,6 +8314,26 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7703,6 +8349,11 @@ $(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7738,6 +8389,21 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7778,6 +8444,16 @@ $(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7818,11 +8494,26 @@ $(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7833,11 +8524,21 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7868,6 +8569,11 @@ $(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7928,6 +8634,11 @@ $(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7948,6 +8659,11 @@ $(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7963,11 +8679,21 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8008,6 +8734,11 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8073,6 +8804,11 @@ $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8083,6 +8819,21 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8098,6 +8849,16 @@ $(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8153,6 +8914,11 @@ $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8163,11 +8929,21 @@ $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8178,11 +8954,46 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.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_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8208,11 +9019,21 @@ $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.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_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8243,6 +9064,11 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8258,18 +9084,27 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
-$(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_108_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 $**
  
  $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  
  $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.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_archive.obj: ..\..\src\common\archive.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.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_clntdata.obj: ..\..\src\common\clntdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8279,6 +9114,9 @@ $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
  $(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8309,6 +9147,9 @@ $(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp
  $(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8321,10 +9162,19 @@ $(OBJS)\basedll_filename.obj: ..\..\src\common\filename.cpp
  $(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_filtall.obj: ..\..\src\common\filtall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
-$(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp
@@ -8366,6 +9216,12 @@ $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp
  $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_platinfo.obj: ..\..\src\common\platinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8390,9 +9246,18 @@ $(OBJS)\basedll_stream.obj: ..\..\src\common\stream.cpp
  $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8405,6 +9270,9 @@ $(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_txtstrm.obj: ..\..\src\common\txtstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8414,7 +9282,10 @@ $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
  $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
-$(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp
+$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
@@ -8450,6 +9321,9 @@ $(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
  $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
+$(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
  $(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
@@ -8495,15 +9369,24 @@ $(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp
  $(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
  $(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
  
-$(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.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_archive.obj: ..\..\src\common\archive.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.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_clntdata.obj: ..\..\src\common\clntdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8513,6 +9396,9 @@ $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
  $(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8543,6 +9429,9 @@ $(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp
  $(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8555,10 +9444,19 @@ $(OBJS)\baselib_filename.obj: ..\..\src\common\filename.cpp
  $(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_filtall.obj: ..\..\src\common\filtall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
-$(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp
@@ -8600,6 +9498,12 @@ $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp
  $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_platinfo.obj: ..\..\src\common\platinfo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8624,9 +9528,18 @@ $(OBJS)\baselib_stream.obj: ..\..\src\common\stream.cpp
  $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_stringimpl.obj: ..\..\src\common\stringimpl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_strvararg.obj: ..\..\src\common\strvararg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8639,6 +9552,9 @@ $(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_txtstrm.obj: ..\..\src\common\txtstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8648,7 +9564,10 @@ $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
  $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
-$(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp
+$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
@@ -8684,6 +9603,9 @@ $(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp
  $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
+$(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
  $(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
@@ -8729,11 +9651,11 @@ $(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp
  $(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
  $(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
  
-$(OBJS)\netdll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_135_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET $**
  
  $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
  $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
@@ -8771,7 +9693,7 @@ $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
  $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
  $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
-$(OBJS)\netlib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
@@ -8810,11 +9732,11 @@ $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
  $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
  
  $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
  
-$(OBJS)\coredll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_162_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 $**
  
  $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -8840,6 +9762,9 @@ $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
  $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
+$(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+
  $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -8894,9 +9819,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
  $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
-$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
  $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -8951,6 +9873,9 @@ $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
  $(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
+$(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+
  $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -8969,6 +9894,9 @@ $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
  $(OBJS)\coredll_metal.obj: ..\..\src\univ\themes\metal.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_metal.obj: ..\..\src\univ\themes\metal.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
+$(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+
  $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -9087,6 +10015,16 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9097,6 +10035,11 @@ $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9267,16 +10210,6 @@ $(OBJS)\coredll_checkbox.obj: ..\..\src\univ\checkbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9317,16 +10250,6 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_imaglist.obj: ..\..\src\generic\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9457,6 +10380,26 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9472,6 +10415,11 @@ $(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9507,6 +10455,21 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9547,6 +10510,16 @@ $(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9587,11 +10560,26 @@ $(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9602,11 +10590,21 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9637,6 +10635,11 @@ $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9697,6 +10700,11 @@ $(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9717,6 +10725,11 @@ $(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9732,11 +10745,21 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9777,6 +10800,11 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9842,6 +10870,11 @@ $(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9852,6 +10885,21 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9867,6 +10915,16 @@ $(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9922,6 +10980,11 @@ $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9932,11 +10995,21 @@ $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9947,7 +11020,7 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
-$(OBJS)\corelib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp
@@ -9974,6 +11047,9 @@ $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
  $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
+$(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+
  $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
@@ -10028,9 +11104,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
  $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
-$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
  $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
@@ -10085,6 +11158,9 @@ $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
  $(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
+$(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+
  $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
@@ -10103,6 +11179,9 @@ $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
  $(OBJS)\corelib_metal.obj: ..\..\src\univ\themes\metal.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_metal.obj: ..\..\src\univ\themes\metal.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
+$(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+
  $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
@@ -10221,6 +11300,16 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10231,6 +11320,11 @@ $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10401,16 +11495,6 @@ $(OBJS)\corelib_checkbox.obj: ..\..\src\univ\checkbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_choice.obj: ..\..\src\msw\choice.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10451,16 +11535,6 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_imaglist.obj: ..\..\src\generic\imaglist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10577,17 +11651,37 @@ $(OBJS)\corelib_stattext.obj: ..\..\src\msw\stattext.cpp
  !endif
  
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
+$(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
+$(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
+$(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
@@ -10606,6 +11700,11 @@ $(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10641,6 +11740,21 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10681,6 +11795,16 @@ $(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10721,11 +11845,26 @@ $(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10736,11 +11875,21 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10771,6 +11920,11 @@ $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10831,6 +11985,11 @@ $(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10851,6 +12010,11 @@ $(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10866,11 +12030,21 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10911,6 +12085,11 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10976,6 +12155,11 @@ $(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10986,6 +12170,21 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11001,6 +12200,16 @@ $(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11056,6 +12265,11 @@ $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11066,11 +12280,21 @@ $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11081,18 +12305,39 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
-$(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_189_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV $**
  
  $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  
  $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
+$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -11108,9 +12353,15 @@ $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp
  $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
  $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
  $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -11129,6 +12380,9 @@ $(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_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
+$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.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_sound.obj: ..\..\src\msw\sound.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
  
@@ -11138,15 +12392,36 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
  $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.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
+$(OBJS)\advlib_dummy.obj: ..\..\src\common\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) $**
  
         $(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_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
+$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -11162,9 +12437,15 @@ $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp
  $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
  $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
  $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -11183,6 +12464,9 @@ $(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_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
+$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.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_sound.obj: ..\..\src\msw\sound.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
  
@@ -11192,32 +12476,50 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
  $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.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
+$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_216_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA $**
  
  $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
  
  
  $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
  
-$(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp
+$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+
+$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
  
-$(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+
+$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+
+$(OBJS)\medialib_dummy.obj: ..\..\src\common\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) $**
  
         $(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
+$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+
+$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+
+$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
  
-$(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+
+$(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_243_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_ODBC $**
  
  $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
  
  $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
@@ -11225,7 +12527,7 @@ $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
  $(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
  
  $(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
  
-$(OBJS)\odbclib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\odbclib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
@@ -11234,26 +12536,26 @@ $(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
  $(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $**
  
  $(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $**
  
-$(OBJS)\dbgriddll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_270_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_DBGRID $**
  
  $(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
  
  
  $(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
  
-$(OBJS)\dbgridlib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\dbgridlib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) $**
  
-$(OBJS)\htmldll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_297_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML $**
  
  $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
  $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
@@ -11264,9 +12566,15 @@ $(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp
  $(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
  $(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
+$(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+
  $(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
  $(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
+$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
+
  $(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
  $(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
@@ -11321,7 +12629,7 @@ $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp
  $(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
  $(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
  
-$(OBJS)\htmllib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp
@@ -11333,9 +12641,15 @@ $(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp
  $(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
  $(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
+$(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+
  $(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
  $(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
+$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
+
  $(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
  $(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
@@ -11390,11 +12704,11 @@ $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp
  $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
  $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
  
-$(OBJS)\qadll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_324_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA $**
  
  $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
  
  $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
@@ -11402,7 +12716,7 @@ $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
  $(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
  
  $(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
  
-$(OBJS)\qalib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
@@ -11411,11 +12725,11 @@ $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
  $(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) $**
  
  $(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) $**
  
-$(OBJS)\xmldll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_351_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML $**
  
  $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
  
  $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
@@ -11423,7 +12737,7 @@ $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
  $(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
  
  $(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
  
-$(OBJS)\xmllib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
@@ -11432,18 +12746,24 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
  $(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
  
  $(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
  
-$(OBJS)\xrcdll_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_378_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC $**
  
  
-$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.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) $**
  
         $(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_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.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) $**
  
@@ -11462,12 +12782,21 @@ $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
  $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.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_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_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.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_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -11477,15 +12806,27 @@ $(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
  $(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
+$(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.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_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_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -11501,6 +12842,9 @@ $(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
  $(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.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_odcombo.obj: ..\..\src\xrc\xh_odcombo.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_panel.obj: ..\..\src\xrc\xh_panel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -11516,6 +12860,9 @@ $(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
  $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.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_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.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_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -11555,6 +12902,9 @@ $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
  $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
+$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
  $(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
  $(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
  
@@ -11567,15 +12917,21 @@ $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
  $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.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
+$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
-$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.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) $**
  
         $(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_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.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_bttn.obj: ..\..\src\xrc\xh_bttn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -11594,12 +12950,21 @@ $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
  $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.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_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_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.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_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -11609,15 +12974,27 @@ $(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
  $(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
+$(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.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_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_grid.obj: ..\..\src\xrc\xh_grid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -11633,6 +13010,9 @@ $(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
  $(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.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_odcombo.obj: ..\..\src\xrc\xh_odcombo.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_panel.obj: ..\..\src\xrc\xh_panel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -11648,6 +13028,9 @@ $(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
  $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.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_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.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_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -11687,6 +13070,9 @@ $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
  $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
+$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
  $(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
  $(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
  
@@ -11699,16 +13085,118 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
  $(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.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
+$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI $**
+
+$(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
+
+$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT $**
+
+$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+
+$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
+$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_405_p_1) $(__NO_VC_CRTDBG_p_55)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) /i ..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_63)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) /i ..\..\src\tiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL $**
  
  $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**
  
  
  $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**
  
-$(OBJS)\gllib_dummy.obj: ..\..\src\msw\dummy.cpp
+$(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
  
  $(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp