X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36751d973eca2dd1c04ab3ac0c9d11d93077bf11..b6a9c1fe8989e36c1f4e1c7bd1e46fb8c9b6a1ca:/build/msw/makefile.bcc

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 77016d4c6e..0f02038389 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -36,8 +36,8 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
 	-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
 	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
-WX_RELEASE_NODOT = 27
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -203,6 +203,8 @@ MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_dummy.obj \
 	$(OBJS)\monodll_appbase.obj \
+	$(OBJS)\monodll_arcall.obj \
+	$(OBJS)\monodll_arcfind.obj \
 	$(OBJS)\monodll_archive.obj \
 	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdline.obj \
@@ -218,12 +220,16 @@ MONODLL_OBJECTS =  \
 	$(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_filtall.obj \
+	$(OBJS)\monodll_filtfind.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 \
@@ -248,6 +254,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_stream.obj \
 	$(OBJS)\monodll_string.obj \
 	$(OBJS)\monodll_sysopt.obj \
+	$(OBJS)\monodll_tarstrm.obj \
 	$(OBJS)\monodll_textbuf.obj \
 	$(OBJS)\monodll_textfile.obj \
 	$(OBJS)\monodll_tokenzr.obj \
@@ -316,6 +323,8 @@ MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_dummy.obj \
 	$(OBJS)\monolib_appbase.obj \
+	$(OBJS)\monolib_arcall.obj \
+	$(OBJS)\monolib_arcfind.obj \
 	$(OBJS)\monolib_archive.obj \
 	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdline.obj \
@@ -331,12 +340,16 @@ MONOLIB_OBJECTS =  \
 	$(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_filtall.obj \
+	$(OBJS)\monolib_filtfind.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 \
@@ -361,6 +374,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_stream.obj \
 	$(OBJS)\monolib_string.obj \
 	$(OBJS)\monolib_sysopt.obj \
+	$(OBJS)\monolib_tarstrm.obj \
 	$(OBJS)\monolib_textbuf.obj \
 	$(OBJS)\monolib_textfile.obj \
 	$(OBJS)\monolib_tokenzr.obj \
@@ -430,6 +444,8 @@ BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_dummy.obj \
 	$(OBJS)\basedll_appbase.obj \
+	$(OBJS)\basedll_arcall.obj \
+	$(OBJS)\basedll_arcfind.obj \
 	$(OBJS)\basedll_archive.obj \
 	$(OBJS)\basedll_clntdata.obj \
 	$(OBJS)\basedll_cmdline.obj \
@@ -445,12 +461,16 @@ BASEDLL_OBJECTS =  \
 	$(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_filtall.obj \
+	$(OBJS)\basedll_filtfind.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 \
@@ -475,6 +495,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_stream.obj \
 	$(OBJS)\basedll_string.obj \
 	$(OBJS)\basedll_sysopt.obj \
+	$(OBJS)\basedll_tarstrm.obj \
 	$(OBJS)\basedll_textbuf.obj \
 	$(OBJS)\basedll_textfile.obj \
 	$(OBJS)\basedll_tokenzr.obj \
@@ -528,6 +549,8 @@ BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_dummy.obj \
 	$(OBJS)\baselib_appbase.obj \
+	$(OBJS)\baselib_arcall.obj \
+	$(OBJS)\baselib_arcfind.obj \
 	$(OBJS)\baselib_archive.obj \
 	$(OBJS)\baselib_clntdata.obj \
 	$(OBJS)\baselib_cmdline.obj \
@@ -543,12 +566,16 @@ BASELIB_OBJECTS =  \
 	$(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_filtall.obj \
+	$(OBJS)\baselib_filtfind.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 \
@@ -573,6 +600,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_stream.obj \
 	$(OBJS)\baselib_string.obj \
 	$(OBJS)\baselib_sysopt.obj \
+	$(OBJS)\baselib_tarstrm.obj \
 	$(OBJS)\baselib_textbuf.obj \
 	$(OBJS)\baselib_textfile.obj \
 	$(OBJS)\baselib_tokenzr.obj \
@@ -723,6 +751,7 @@ MEDIADLL_OBJECTS =  \
 	$(OBJS)\mediadll_mediactrlcmn.obj \
 	$(OBJS)\mediadll_mediactrl_am.obj \
 	$(OBJS)\mediadll_mediactrl_wmp10.obj \
+	$(OBJS)\mediadll_mediactrl_qt.obj \
 	$(OBJS)\mediadll_activex.obj
 MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -737,6 +766,7 @@ MEDIALIB_OBJECTS =  \
 	$(OBJS)\medialib_mediactrlcmn.obj \
 	$(OBJS)\medialib_mediactrl_am.obj \
 	$(OBJS)\medialib_mediactrl_wmp10.obj \
+	$(OBJS)\medialib_mediactrl_qt.obj \
 	$(OBJS)\medialib_activex.obj
 ODBCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -910,6 +940,7 @@ XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	-H=$(OBJS)\wxprec_xrcdll.csm $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_dummy.obj \
+	$(OBJS)\xrcdll_xh_animatctrl.obj \
 	$(OBJS)\xrcdll_xh_bmp.obj \
 	$(OBJS)\xrcdll_xh_bmpcbox.obj \
 	$(OBJS)\xrcdll_xh_bmpbt.obj \
@@ -920,6 +951,7 @@ XRCDLL_OBJECTS =  \
 	$(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_dirpicker.obj \
@@ -944,6 +976,7 @@ XRCDLL_OBJECTS =  \
 	$(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 \
@@ -972,6 +1005,7 @@ XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_dummy.obj \
+	$(OBJS)\xrclib_xh_animatctrl.obj \
 	$(OBJS)\xrclib_xh_bmp.obj \
 	$(OBJS)\xrclib_xh_bmpcbox.obj \
 	$(OBJS)\xrclib_xh_bmpbt.obj \
@@ -982,6 +1016,7 @@ XRCLIB_OBJECTS =  \
 	$(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_dirpicker.obj \
@@ -1006,6 +1041,7 @@ XRCLIB_OBJECTS =  \
 	$(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 \
@@ -1071,7 +1107,8 @@ RICHTEXTDLL_OBJECTS =  \
 	$(OBJS)\richtextdll_richtexthtml.obj \
 	$(OBJS)\richtextdll_richtextformatdlg.obj \
 	$(OBJS)\richtextdll_richtextsymboldlg.obj \
-	$(OBJS)\richtextdll_richtextstyledlg.obj
+	$(OBJS)\richtextdll_richtextstyledlg.obj \
+	$(OBJS)\richtextdll_richtextprint.obj
 RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1089,7 +1126,8 @@ RICHTEXTLIB_OBJECTS =  \
 	$(OBJS)\richtextlib_richtexthtml.obj \
 	$(OBJS)\richtextlib_richtextformatdlg.obj \
 	$(OBJS)\richtextlib_richtextsymboldlg.obj \
-	$(OBJS)\richtextlib_richtextstyledlg.obj
+	$(OBJS)\richtextlib_richtextstyledlg.obj \
+	$(OBJS)\richtextlib_richtextprint.obj
 GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1175,6 +1213,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_mediactrlcmn.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 \
@@ -1205,6 +1244,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_debugrpt.obj \
 	$(OBJS)\monodll_dbgrptg.obj \
 	$(OBJS)\monodll_dbgrid.obj \
+	$(OBJS)\monodll_xh_animatctrl.obj \
 	$(OBJS)\monodll_xh_bmp.obj \
 	$(OBJS)\monodll_xh_bmpcbox.obj \
 	$(OBJS)\monodll_xh_bmpbt.obj \
@@ -1215,6 +1255,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(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_dirpicker.obj \
@@ -1239,6 +1280,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1269,7 +1311,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtexthtml.obj \
 	$(OBJS)\monodll_richtextformatdlg.obj \
 	$(OBJS)\monodll_richtextsymboldlg.obj \
-	$(OBJS)\monodll_richtextstyledlg.obj
+	$(OBJS)\monodll_richtextstyledlg.obj \
+	$(OBJS)\monodll_richtextprint.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -1392,6 +1435,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1408,6 +1452,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontcmn.obj \
 	$(OBJS)\monodll_fontenumcmn.obj \
 	$(OBJS)\monodll_fontmap.obj \
+	$(OBJS)\monodll_fontutilcmn.obj \
 	$(OBJS)\monodll_framecmn.obj \
 	$(OBJS)\monodll_gaugecmn.obj \
 	$(OBJS)\monodll_gbsizer.obj \
@@ -1427,6 +1472,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1435,6 +1481,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_matrix.obj \
 	$(OBJS)\monodll_menucmn.obj \
 	$(OBJS)\monodll_nbkbase.obj \
+	$(OBJS)\monodll_overlaycmn.obj \
 	$(OBJS)\monodll_paper.obj \
 	$(OBJS)\monodll_pickerbase.obj \
 	$(OBJS)\monodll_popupcmn.obj \
@@ -1445,6 +1492,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1462,6 +1510,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1479,6 +1528,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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_toolbkg.obj \
@@ -1611,6 +1661,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1627,6 +1678,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontcmn.obj \
 	$(OBJS)\monodll_fontenumcmn.obj \
 	$(OBJS)\monodll_fontmap.obj \
+	$(OBJS)\monodll_fontutilcmn.obj \
 	$(OBJS)\monodll_framecmn.obj \
 	$(OBJS)\monodll_gaugecmn.obj \
 	$(OBJS)\monodll_gbsizer.obj \
@@ -1646,6 +1698,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1654,6 +1707,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_matrix.obj \
 	$(OBJS)\monodll_menucmn.obj \
 	$(OBJS)\monodll_nbkbase.obj \
+	$(OBJS)\monodll_overlaycmn.obj \
 	$(OBJS)\monodll_paper.obj \
 	$(OBJS)\monodll_pickerbase.obj \
 	$(OBJS)\monodll_popupcmn.obj \
@@ -1664,6 +1718,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1681,6 +1736,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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 \
@@ -1698,6 +1754,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(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_toolbkg.obj \
@@ -1711,6 +1768,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_animatecmn.obj \
 	$(OBJS)\monodll_datavcmn.obj \
 	$(OBJS)\monodll_aboutdlgg.obj \
+	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_bmpcboxg.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datavgen.obj \
@@ -1727,7 +1785,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_splash.obj \
 	$(OBJS)\monodll_tipdlg.obj \
 	$(OBJS)\monodll_wizard.obj \
-	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_taskbarcmn.obj \
 	$(OBJS)\monodll_aboutdlg.obj \
 	$(OBJS)\monodll_sound.obj \
@@ -1740,6 +1797,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_animatecmn.obj \
 	$(OBJS)\monodll_datavcmn.obj \
 	$(OBJS)\monodll_aboutdlgg.obj \
+	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_bmpcboxg.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datavgen.obj \
@@ -1756,7 +1814,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_splash.obj \
 	$(OBJS)\monodll_tipdlg.obj \
 	$(OBJS)\monodll_wizard.obj \
-	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_taskbarcmn.obj \
 	$(OBJS)\monodll_aboutdlg.obj \
 	$(OBJS)\monodll_sound.obj \
@@ -1774,6 +1831,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_mediactrlcmn.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 \
@@ -1804,6 +1862,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_debugrpt.obj \
 	$(OBJS)\monolib_dbgrptg.obj \
 	$(OBJS)\monolib_dbgrid.obj \
+	$(OBJS)\monolib_xh_animatctrl.obj \
 	$(OBJS)\monolib_xh_bmp.obj \
 	$(OBJS)\monolib_xh_bmpcbox.obj \
 	$(OBJS)\monolib_xh_bmpbt.obj \
@@ -1814,6 +1873,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(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_dirpicker.obj \
@@ -1838,6 +1898,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -1868,7 +1929,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtexthtml.obj \
 	$(OBJS)\monolib_richtextformatdlg.obj \
 	$(OBJS)\monolib_richtextsymboldlg.obj \
-	$(OBJS)\monolib_richtextstyledlg.obj
+	$(OBJS)\monolib_richtextstyledlg.obj \
+	$(OBJS)\monolib_richtextprint.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -1991,6 +2053,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -2007,6 +2070,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontcmn.obj \
 	$(OBJS)\monolib_fontenumcmn.obj \
 	$(OBJS)\monolib_fontmap.obj \
+	$(OBJS)\monolib_fontutilcmn.obj \
 	$(OBJS)\monolib_framecmn.obj \
 	$(OBJS)\monolib_gaugecmn.obj \
 	$(OBJS)\monolib_gbsizer.obj \
@@ -2026,6 +2090,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -2034,6 +2099,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_matrix.obj \
 	$(OBJS)\monolib_menucmn.obj \
 	$(OBJS)\monolib_nbkbase.obj \
+	$(OBJS)\monolib_overlaycmn.obj \
 	$(OBJS)\monolib_paper.obj \
 	$(OBJS)\monolib_pickerbase.obj \
 	$(OBJS)\monolib_popupcmn.obj \
@@ -2044,6 +2110,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -2061,6 +2128,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -2078,6 +2146,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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_toolbkg.obj \
@@ -2210,6 +2279,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -2226,6 +2296,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontcmn.obj \
 	$(OBJS)\monolib_fontenumcmn.obj \
 	$(OBJS)\monolib_fontmap.obj \
+	$(OBJS)\monolib_fontutilcmn.obj \
 	$(OBJS)\monolib_framecmn.obj \
 	$(OBJS)\monolib_gaugecmn.obj \
 	$(OBJS)\monolib_gbsizer.obj \
@@ -2245,6 +2316,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -2253,6 +2325,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_matrix.obj \
 	$(OBJS)\monolib_menucmn.obj \
 	$(OBJS)\monolib_nbkbase.obj \
+	$(OBJS)\monolib_overlaycmn.obj \
 	$(OBJS)\monolib_paper.obj \
 	$(OBJS)\monolib_pickerbase.obj \
 	$(OBJS)\monolib_popupcmn.obj \
@@ -2263,6 +2336,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -2280,6 +2354,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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 \
@@ -2297,6 +2372,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(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_toolbkg.obj \
@@ -2310,6 +2386,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_animatecmn.obj \
 	$(OBJS)\monolib_datavcmn.obj \
 	$(OBJS)\monolib_aboutdlgg.obj \
+	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_bmpcboxg.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datavgen.obj \
@@ -2326,7 +2403,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_splash.obj \
 	$(OBJS)\monolib_tipdlg.obj \
 	$(OBJS)\monolib_wizard.obj \
-	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_taskbarcmn.obj \
 	$(OBJS)\monolib_aboutdlg.obj \
 	$(OBJS)\monolib_sound.obj \
@@ -2339,6 +2415,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_animatecmn.obj \
 	$(OBJS)\monolib_datavcmn.obj \
 	$(OBJS)\monolib_aboutdlgg.obj \
+	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_bmpcboxg.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datavgen.obj \
@@ -2355,7 +2432,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_splash.obj \
 	$(OBJS)\monolib_tipdlg.obj \
 	$(OBJS)\monolib_wizard.obj \
-	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_taskbarcmn.obj \
 	$(OBJS)\monolib_aboutdlg.obj \
 	$(OBJS)\monolib_sound.obj \
@@ -2503,6 +2579,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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 \
@@ -2519,6 +2596,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontcmn.obj \
 	$(OBJS)\coredll_fontenumcmn.obj \
 	$(OBJS)\coredll_fontmap.obj \
+	$(OBJS)\coredll_fontutilcmn.obj \
 	$(OBJS)\coredll_framecmn.obj \
 	$(OBJS)\coredll_gaugecmn.obj \
 	$(OBJS)\coredll_gbsizer.obj \
@@ -2538,6 +2616,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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 \
@@ -2546,6 +2625,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_matrix.obj \
 	$(OBJS)\coredll_menucmn.obj \
 	$(OBJS)\coredll_nbkbase.obj \
+	$(OBJS)\coredll_overlaycmn.obj \
 	$(OBJS)\coredll_paper.obj \
 	$(OBJS)\coredll_pickerbase.obj \
 	$(OBJS)\coredll_popupcmn.obj \
@@ -2556,6 +2636,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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 \
@@ -2573,6 +2654,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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 \
@@ -2590,6 +2672,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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_toolbkg.obj \
@@ -2722,6 +2805,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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 \
@@ -2738,6 +2822,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontcmn.obj \
 	$(OBJS)\coredll_fontenumcmn.obj \
 	$(OBJS)\coredll_fontmap.obj \
+	$(OBJS)\coredll_fontutilcmn.obj \
 	$(OBJS)\coredll_framecmn.obj \
 	$(OBJS)\coredll_gaugecmn.obj \
 	$(OBJS)\coredll_gbsizer.obj \
@@ -2757,6 +2842,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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 \
@@ -2765,6 +2851,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_matrix.obj \
 	$(OBJS)\coredll_menucmn.obj \
 	$(OBJS)\coredll_nbkbase.obj \
+	$(OBJS)\coredll_overlaycmn.obj \
 	$(OBJS)\coredll_paper.obj \
 	$(OBJS)\coredll_pickerbase.obj \
 	$(OBJS)\coredll_popupcmn.obj \
@@ -2775,6 +2862,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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 \
@@ -2792,6 +2880,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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 \
@@ -2809,6 +2898,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(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_toolbkg.obj \
@@ -2942,6 +3032,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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 \
@@ -2958,6 +3049,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontcmn.obj \
 	$(OBJS)\corelib_fontenumcmn.obj \
 	$(OBJS)\corelib_fontmap.obj \
+	$(OBJS)\corelib_fontutilcmn.obj \
 	$(OBJS)\corelib_framecmn.obj \
 	$(OBJS)\corelib_gaugecmn.obj \
 	$(OBJS)\corelib_gbsizer.obj \
@@ -2977,6 +3069,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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 \
@@ -2985,6 +3078,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_matrix.obj \
 	$(OBJS)\corelib_menucmn.obj \
 	$(OBJS)\corelib_nbkbase.obj \
+	$(OBJS)\corelib_overlaycmn.obj \
 	$(OBJS)\corelib_paper.obj \
 	$(OBJS)\corelib_pickerbase.obj \
 	$(OBJS)\corelib_popupcmn.obj \
@@ -2995,6 +3089,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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 \
@@ -3012,6 +3107,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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 \
@@ -3029,6 +3125,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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_toolbkg.obj \
@@ -3161,6 +3258,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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 \
@@ -3177,6 +3275,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontcmn.obj \
 	$(OBJS)\corelib_fontenumcmn.obj \
 	$(OBJS)\corelib_fontmap.obj \
+	$(OBJS)\corelib_fontutilcmn.obj \
 	$(OBJS)\corelib_framecmn.obj \
 	$(OBJS)\corelib_gaugecmn.obj \
 	$(OBJS)\corelib_gbsizer.obj \
@@ -3196,6 +3295,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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 \
@@ -3204,6 +3304,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_matrix.obj \
 	$(OBJS)\corelib_menucmn.obj \
 	$(OBJS)\corelib_nbkbase.obj \
+	$(OBJS)\corelib_overlaycmn.obj \
 	$(OBJS)\corelib_paper.obj \
 	$(OBJS)\corelib_pickerbase.obj \
 	$(OBJS)\corelib_popupcmn.obj \
@@ -3214,6 +3315,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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 \
@@ -3231,6 +3333,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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 \
@@ -3248,6 +3351,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(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_toolbkg.obj \
@@ -3265,6 +3369,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_animatecmn.obj \
 	$(OBJS)\advdll_datavcmn.obj \
 	$(OBJS)\advdll_aboutdlgg.obj \
+	$(OBJS)\advdll_animateg.obj \
 	$(OBJS)\advdll_bmpcboxg.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datavgen.obj \
@@ -3281,7 +3386,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_splash.obj \
 	$(OBJS)\advdll_tipdlg.obj \
 	$(OBJS)\advdll_wizard.obj \
-	$(OBJS)\advdll_animateg.obj \
 	$(OBJS)\advdll_taskbarcmn.obj \
 	$(OBJS)\advdll_aboutdlg.obj \
 	$(OBJS)\advdll_sound.obj \
@@ -3294,6 +3398,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_animatecmn.obj \
 	$(OBJS)\advdll_datavcmn.obj \
 	$(OBJS)\advdll_aboutdlgg.obj \
+	$(OBJS)\advdll_animateg.obj \
 	$(OBJS)\advdll_bmpcboxg.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datavgen.obj \
@@ -3310,7 +3415,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_splash.obj \
 	$(OBJS)\advdll_tipdlg.obj \
 	$(OBJS)\advdll_wizard.obj \
-	$(OBJS)\advdll_animateg.obj \
 	$(OBJS)\advdll_taskbarcmn.obj \
 	$(OBJS)\advdll_aboutdlg.obj \
 	$(OBJS)\advdll_sound.obj \
@@ -3326,6 +3430,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_animatecmn.obj \
 	$(OBJS)\advlib_datavcmn.obj \
 	$(OBJS)\advlib_aboutdlgg.obj \
+	$(OBJS)\advlib_animateg.obj \
 	$(OBJS)\advlib_bmpcboxg.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datavgen.obj \
@@ -3342,7 +3447,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_splash.obj \
 	$(OBJS)\advlib_tipdlg.obj \
 	$(OBJS)\advlib_wizard.obj \
-	$(OBJS)\advlib_animateg.obj \
 	$(OBJS)\advlib_taskbarcmn.obj \
 	$(OBJS)\advlib_aboutdlg.obj \
 	$(OBJS)\advlib_sound.obj \
@@ -3355,6 +3459,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_animatecmn.obj \
 	$(OBJS)\advlib_datavcmn.obj \
 	$(OBJS)\advlib_aboutdlgg.obj \
+	$(OBJS)\advlib_animateg.obj \
 	$(OBJS)\advlib_bmpcboxg.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datavgen.obj \
@@ -3371,7 +3476,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_splash.obj \
 	$(OBJS)\advlib_tipdlg.obj \
 	$(OBJS)\advlib_wizard.obj \
-	$(OBJS)\advlib_animateg.obj \
 	$(OBJS)\advlib_taskbarcmn.obj \
 	$(OBJS)\advlib_aboutdlg.obj \
 	$(OBJS)\advlib_sound.obj \
@@ -3470,6 +3574,13 @@ __WXLIB_MONO_p = \
 __gllib___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 !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 "$(USE_THREADS)" == "0"
 __THREADSFLAG_12 = 
 !endif
@@ -3953,9 +4064,9 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(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)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(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_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(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) ole2w32.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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res
+	c0d32.obj $(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) ole2w32.lib oleacc.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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@
 !endif
@@ -3985,9 +4096,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS)  $(OBJS)\richtextdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS)  $(OBJS)\richtextdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(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) ole2w32.lib oleacc.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)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\richtextdll_version.res
+	c0d32.obj $(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) ole2w32.lib oleacc.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 import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\richtextdll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext $@
 !endif
@@ -4045,8 +4156,8 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
-	@echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(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)
@@ -4436,6 +4547,12 @@ $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4481,6 +4598,9 @@ $(OBJS)\monodll_ffile.obj: ..\..\src\common\ffile.cpp
 $(OBJS)\monodll_file.obj: ..\..\src\common\file.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_fileback.obj: ..\..\src\common\fileback.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_fileconf.obj: ..\..\src\common\fileconf.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4493,10 +4613,19 @@ $(OBJS)\monodll_filename.obj: ..\..\src\common\filename.cpp
 $(OBJS)\monodll_filesys.obj: ..\..\src\common\filesys.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_filtall.obj: ..\..\src\common\filtall.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_filtfind.obj: ..\..\src\common\filtfind.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp
@@ -4571,6 +4700,9 @@ $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp
 $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4865,6 +4997,9 @@ $(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4955,6 +5090,9 @@ $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4985,6 +5123,9 @@ $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5057,6 +5198,9 @@ $(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5150,6 +5294,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 $(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5766,6 +5913,11 @@ $(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5846,6 +5998,11 @@ $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5941,6 +6098,11 @@ $(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5981,6 +6143,11 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6031,6 +6198,11 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6116,6 +6288,11 @@ $(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6201,6 +6378,11 @@ $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6251,6 +6433,11 @@ $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6331,11 +6518,6 @@ $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6367,6 +6549,12 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6412,6 +6600,9 @@ $(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp
 $(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6424,10 +6615,19 @@ $(OBJS)\monolib_filename.obj: ..\..\src\common\filename.cpp
 $(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_filtall.obj: ..\..\src\common\filtall.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp
@@ -6502,6 +6702,9 @@ $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp
 $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6796,6 +6999,9 @@ $(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6886,6 +7092,9 @@ $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6916,6 +7125,9 @@ $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6988,6 +7200,9 @@ $(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -7081,6 +7296,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 $(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -7697,6 +7915,11 @@ $(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7777,6 +8000,11 @@ $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7872,6 +8100,11 @@ $(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7912,6 +8145,11 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7962,6 +8200,11 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8047,6 +8290,11 @@ $(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8132,6 +8380,11 @@ $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8182,6 +8435,11 @@ $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8262,11 +8520,6 @@ $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8301,6 +8554,12 @@ $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -8346,6 +8605,9 @@ $(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp
 $(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -8358,10 +8620,19 @@ $(OBJS)\basedll_filename.obj: ..\..\src\common\filename.cpp
 $(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_filtall.obj: ..\..\src\common\filtall.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
 $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp
@@ -8436,6 +8707,9 @@ $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp
 $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -8547,6 +8821,12 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -8592,6 +8872,9 @@ $(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp
 $(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -8604,10 +8887,19 @@ $(OBJS)\baselib_filename.obj: ..\..\src\common\filename.cpp
 $(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_filtall.obj: ..\..\src\common\filtall.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
 $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp
@@ -8682,6 +8974,9 @@ $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp
 $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -9646,6 +9941,11 @@ $(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9726,6 +10026,11 @@ $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9821,6 +10126,11 @@ $(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9861,6 +10171,11 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9911,6 +10226,11 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9996,6 +10316,11 @@ $(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -10081,6 +10406,11 @@ $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -10891,6 +11221,11 @@ $(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10971,6 +11306,11 @@ $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -11066,6 +11406,11 @@ $(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -11106,6 +11451,11 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -11156,6 +11506,11 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -11241,6 +11596,11 @@ $(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -11326,6 +11686,11 @@ $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -11379,6 +11744,9 @@ $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -11427,9 +11795,6 @@ $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
-
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -11460,6 +11825,9 @@ $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
@@ -11508,9 +11876,6 @@ $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
-
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
@@ -11541,6 +11906,9 @@ $(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
 
+$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+	$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
+
 $(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
 	$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
 
@@ -11556,6 +11924,9 @@ $(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
 
+$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+	$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
+
 $(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
 	$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
 
@@ -11796,6 +12167,9 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -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 -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG) $**
 
+$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
+
 $(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
 
@@ -11826,6 +12200,9 @@ $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
 
+$(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
+
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
 
@@ -11898,6 +12275,9 @@ $(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
 
+$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
+
 $(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
 
@@ -11955,6 +12335,9 @@ $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
 $(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H $**
 
+$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
+
 $(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
 
@@ -11985,6 +12368,9 @@ $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
 
+$(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
+
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
 
@@ -12057,6 +12443,9 @@ $(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
 
+$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
+
 $(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
 
@@ -12180,6 +12569,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
 $(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $**
 
+$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $**
+
 $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H $**
 
@@ -12207,6 +12599,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
 $(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $**
 
+$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp
+	$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $**
+
 $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $**