rebaked after adding threads/atomic.cpp

[wxWidgets.git] / build / os2 / makefile.wat

diff --git a/build/os2/makefile.wat b/build/os2/makefile.wat
index 0b6b57d9b188fc10dad1d84c09942271188e1a9b..73770ff3e91c73f67dc86254f02017481266e4b6 100644 (file)
--- a/build/os2/makefile.wat
+++ b/build/os2/makefile.wat
@@ -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!
 # =========================================================================
 
@@ -122,6 +122,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 &
@@ -132,6 +133,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 &
@@ -156,6 +158,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 &
@@ -183,7 +186,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_richtextbuffer.obj &
        $(OBJS)\monodll_richtextstyles.obj &
        $(OBJS)\monodll_richtextxml.obj &
-       $(OBJS)\monodll_richtexthtml.obj
+       $(OBJS)\monodll_richtexthtml.obj &
+       $(OBJS)\monodll_richtextformatdlg.obj &
+       $(OBJS)\monodll_richtextsymboldlg.obj &
+       $(OBJS)\monodll_richtextstyledlg.obj &
+       $(OBJS)\monodll_richtextprint.obj
 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
@@ -269,6 +276,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_utilsgui.obj &
        $(OBJS)\monodll_window.obj &
        $(OBJS)\monodll_accesscmn.obj &
+       $(OBJS)\monodll_anidecod.obj &
        $(OBJS)\monodll_appcmn.obj &
        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
@@ -287,6 +295,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(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 &
@@ -309,6 +319,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(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 &
@@ -321,6 +332,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 &
@@ -329,6 +341,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 &
@@ -339,6 +352,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 &
@@ -356,6 +370,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 &
@@ -373,6 +388,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 &
@@ -437,6 +453,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_mono.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 &
@@ -455,6 +472,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(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 &
@@ -477,6 +496,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(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 &
@@ -489,6 +509,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 &
@@ -497,6 +518,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 &
@@ -507,6 +529,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 &
@@ -524,6 +547,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 &
@@ -541,6 +565,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 &
@@ -553,7 +578,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_OBJECTS =
 !ifeq WXUNIV 0
 ____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 &
@@ -575,7 +603,10 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____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 &
@@ -636,6 +667,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 &
@@ -646,6 +678,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 &
@@ -670,6 +703,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 &
@@ -697,7 +731,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_richtextbuffer.obj &
        $(OBJS)\monolib_richtextstyles.obj &
        $(OBJS)\monolib_richtextxml.obj &
-       $(OBJS)\monolib_richtexthtml.obj
+       $(OBJS)\monolib_richtexthtml.obj &
+       $(OBJS)\monolib_richtextformatdlg.obj &
+       $(OBJS)\monolib_richtextsymboldlg.obj &
+       $(OBJS)\monolib_richtextstyledlg.obj &
+       $(OBJS)\monolib_richtextprint.obj
 !endif
 ____CORE_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
@@ -783,6 +821,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_window.obj &
        $(OBJS)\monolib_accesscmn.obj &
+       $(OBJS)\monolib_anidecod.obj &
        $(OBJS)\monolib_appcmn.obj &
        $(OBJS)\monolib_artprov.obj &
        $(OBJS)\monolib_artstd.obj &
@@ -801,6 +840,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(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 &
@@ -823,6 +864,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(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 &
@@ -835,6 +877,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 &
@@ -843,6 +886,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 &
@@ -853,6 +897,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 &
@@ -870,6 +915,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 &
@@ -887,6 +933,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 &
@@ -951,6 +998,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_mono.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 &
@@ -969,6 +1017,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(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 &
@@ -991,6 +1041,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(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 &
@@ -1003,6 +1054,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 &
@@ -1011,6 +1063,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 &
@@ -1021,6 +1074,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 &
@@ -1038,6 +1092,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 &
@@ -1055,6 +1110,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 &
@@ -1067,7 +1123,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
 !ifeq WXUNIV 0
 ____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 &
@@ -1089,7 +1148,10 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____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 &
@@ -1230,6 +1292,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_window.obj &
        $(OBJS)\coredll_accesscmn.obj &
+       $(OBJS)\coredll_anidecod.obj &
        $(OBJS)\coredll_appcmn.obj &
        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
@@ -1248,6 +1311,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(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 &
@@ -1270,6 +1335,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(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 &
@@ -1282,6 +1348,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 &
@@ -1290,6 +1357,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 &
@@ -1300,6 +1368,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 &
@@ -1317,6 +1386,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 &
@@ -1334,6 +1404,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 &
@@ -1398,6 +1469,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_mono.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 &
@@ -1416,6 +1488,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(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 &
@@ -1438,6 +1512,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(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 &
@@ -1450,6 +1525,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 &
@@ -1458,6 +1534,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 &
@@ -1468,6 +1545,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 &
@@ -1485,6 +1563,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 &
@@ -1502,6 +1581,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 &
@@ -1604,6 +1684,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_window.obj &
        $(OBJS)\corelib_accesscmn.obj &
+       $(OBJS)\corelib_anidecod.obj &
        $(OBJS)\corelib_appcmn.obj &
        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
@@ -1622,6 +1703,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(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 &
@@ -1644,6 +1727,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(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 &
@@ -1656,6 +1740,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 &
@@ -1664,6 +1749,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 &
@@ -1674,6 +1760,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 &
@@ -1691,6 +1778,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 &
@@ -1708,6 +1796,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 &
@@ -1772,6 +1861,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_mono.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 &
@@ -1790,6 +1880,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(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 &
@@ -1812,6 +1904,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(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 &
@@ -1824,6 +1917,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 &
@@ -1832,6 +1926,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 &
@@ -1842,6 +1937,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 &
@@ -1859,6 +1955,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 &
@@ -1876,6 +1973,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 &
@@ -1897,7 +1995,10 @@ __advdll___depname = &
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
 !ifeq WXUNIV 0
 ____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 &
@@ -1919,7 +2020,10 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____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 &
@@ -1951,7 +2055,10 @@ __advlib___depname = &
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
 !ifeq WXUNIV 0
 ____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 &
@@ -1973,7 +2080,10 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____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 &
@@ -2310,6 +2420,10 @@ __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
 __SETUP_H_SUBDIR_FILENAMES =
 !ifeq WXUNIV 0
 __SETUP_H_SUBDIR_FILENAMES = os2
@@ -2329,12 +2443,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        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_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)"
-WX_RELEASE_NODOT = 27
+WX_RELEASE_NODOT = 28
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -2480,21 +2594,24 @@ WXEXPAT_OBJECTS =  &
 MONODLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 &
-       -dWXMAKINGDLL /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL &
+       /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 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 &
@@ -2510,12 +2627,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 &
@@ -2540,6 +2661,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 &
@@ -2579,21 +2701,23 @@ MONODLL_OBJECTS =  &
 MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 &
-       $(CPPFLAGS) $(CFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 &
-       /fh=$(OBJS)\wxprec_monolib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_monolib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 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 &
@@ -2609,12 +2733,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 &
@@ -2639,6 +2767,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 &
@@ -2678,21 +2807,25 @@ MONOLIB_OBJECTS =  &
 BASEDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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 /fh=$(OBJS)\wxprec_basedll.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 &
+       /fh=$(OBJS)\wxprec_basedll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 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 &
@@ -2708,12 +2841,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 &
@@ -2738,6 +2875,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 &
@@ -2763,21 +2901,24 @@ BASEDLL_OBJECTS =  &
 BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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 /fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 &
+       /fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 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 &
@@ -2793,12 +2934,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 &
@@ -2823,6 +2968,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 &
@@ -2848,11 +2994,12 @@ BASELIB_OBJECTS =  &
 NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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 /fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 &
+       /fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
 NETDLL_OBJECTS =  &
        $(OBJS)\netdll_dummy.obj &
        $(OBJS)\netdll_fs_inet.obj &
@@ -2869,11 +3016,11 @@ NETDLL_OBJECTS =  &
 NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       /fh=$(OBJS)\wxprec_netlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_netlib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 NETLIB_OBJECTS =  &
        $(OBJS)\netlib_dummy.obj &
        $(OBJS)\netlib_fs_inet.obj &
@@ -2890,11 +3037,12 @@ NETLIB_OBJECTS =  &
 COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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 /fh=$(OBJS)\wxprec_coredll.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 &
+       /fh=$(OBJS)\wxprec_coredll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 COREDLL_OBJECTS =  &
        $(OBJS)\coredll_dummy.obj &
        $(OBJS)\coredll_event.obj &
@@ -2905,11 +3053,11 @@ COREDLL_OBJECTS =  &
 CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=0 &
-       /fh=$(OBJS)\wxprec_corelib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_BASE=0 /fh=$(OBJS)\wxprec_corelib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 CORELIB_OBJECTS =  &
        $(OBJS)\corelib_dummy.obj &
        $(OBJS)\corelib_event.obj &
@@ -2920,55 +3068,58 @@ CORELIB_OBJECTS =  &
 ADVDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_ADV /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV &
+       /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
 ADVDLL_OBJECTS =  &
        $(OBJS)\advdll_dummy.obj &
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
 ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 ADVLIB_OBJECTS =  &
        $(OBJS)\advlib_dummy.obj &
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_MEDIA /fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA &
+       /fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 MEDIADLL_OBJECTS =  &
        $(OBJS)\mediadll_dummy.obj &
        $(OBJS)\mediadll_mediactrlcmn.obj
 MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 MEDIALIB_OBJECTS =  &
        $(OBJS)\medialib_dummy.obj &
        $(OBJS)\medialib_mediactrlcmn.obj
 ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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 /fh=$(OBJS)\wxprec_odbcdll.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 &
+       /fh=$(OBJS)\wxprec_odbcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 ODBCDLL_OBJECTS =  &
        $(OBJS)\odbcdll_dummy.obj &
        $(OBJS)\odbcdll_db.obj &
@@ -2976,11 +3127,11 @@ ODBCDLL_OBJECTS =  &
 ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       /fh=$(OBJS)\wxprec_odbclib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_odbclib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 ODBCLIB_OBJECTS =  &
        $(OBJS)\odbclib_dummy.obj &
        $(OBJS)\odbclib_db.obj &
@@ -2988,33 +3139,35 @@ ODBCLIB_OBJECTS =  &
 DBGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_DBGRID /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID &
+       /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 DBGRIDDLL_OBJECTS =  &
        $(OBJS)\dbgriddll_dummy.obj &
        $(OBJS)\dbgriddll_dbgrid.obj
 DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 DBGRIDLIB_OBJECTS =  &
        $(OBJS)\dbgridlib_dummy.obj &
        $(OBJS)\dbgridlib_dbgrid.obj
 HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_HTML /fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML &
+       /fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 HTMLDLL_OBJECTS =  &
        $(OBJS)\htmldll_dummy.obj &
        $(OBJS)\htmldll_helpctrl.obj &
@@ -3043,11 +3196,11 @@ HTMLDLL_OBJECTS =  &
 HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_dummy.obj &
        $(OBJS)\htmllib_helpctrl.obj &
@@ -3076,11 +3229,12 @@ HTMLLIB_OBJECTS =  &
 QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_QA /fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA &
+       /fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
 QADLL_OBJECTS =  &
        $(OBJS)\qadll_dummy.obj &
        $(OBJS)\qadll_debugrpt.obj &
@@ -3088,11 +3242,11 @@ QADLL_OBJECTS =  &
 QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 QALIB_OBJECTS =  &
        $(OBJS)\qalib_dummy.obj &
        $(OBJS)\qalib_debugrpt.obj &
@@ -3100,11 +3254,12 @@ QALIB_OBJECTS =  &
 XMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -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 /fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -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 &
+       /fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
 XMLDLL_OBJECTS =  &
        $(OBJS)\xmldll_dummy.obj &
        $(OBJS)\xmldll_xml.obj &
@@ -3112,11 +3267,11 @@ XMLDLL_OBJECTS =  &
 XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       /fh=$(OBJS)\wxprec_xmllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_xmllib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 XMLLIB_OBJECTS =  &
        $(OBJS)\xmllib_dummy.obj &
        $(OBJS)\xmllib_xml.obj &
@@ -3124,13 +3279,15 @@ XMLLIB_OBJECTS =  &
 XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_XRC /fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC &
+       /fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(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 &
@@ -3141,6 +3298,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 &
@@ -3165,6 +3323,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 &
@@ -3186,13 +3345,14 @@ XRCDLL_OBJECTS =  &
 XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(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 &
@@ -3203,6 +3363,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 &
@@ -3227,6 +3388,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 &
@@ -3248,11 +3410,12 @@ XRCLIB_OBJECTS =  &
 AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_AUI /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI &
+       /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
 AUIDLL_OBJECTS =  &
        $(OBJS)\auidll_dummy.obj &
        $(OBJS)\auidll_framemanager.obj &
@@ -3263,11 +3426,11 @@ AUIDLL_OBJECTS =  &
 AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 AUILIB_OBJECTS =  &
        $(OBJS)\auilib_dummy.obj &
        $(OBJS)\auilib_framemanager.obj &
@@ -3278,52 +3441,62 @@ AUILIB_OBJECTS =  &
 RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_RICHTEXT /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT &
+       /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTDLL_OBJECTS =  &
        $(OBJS)\richtextdll_dummy.obj &
        $(OBJS)\richtextdll_richtextctrl.obj &
        $(OBJS)\richtextdll_richtextbuffer.obj &
        $(OBJS)\richtextdll_richtextstyles.obj &
        $(OBJS)\richtextdll_richtextxml.obj &
-       $(OBJS)\richtextdll_richtexthtml.obj
+       $(OBJS)\richtextdll_richtexthtml.obj &
+       $(OBJS)\richtextdll_richtextformatdlg.obj &
+       $(OBJS)\richtextdll_richtextsymboldlg.obj &
+       $(OBJS)\richtextdll_richtextstyledlg.obj &
+       $(OBJS)\richtextdll_richtextprint.obj
 RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(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_richtexthtml.obj &
+       $(OBJS)\richtextlib_richtextformatdlg.obj &
+       $(OBJS)\richtextlib_richtextsymboldlg.obj &
+       $(OBJS)\richtextlib_richtextstyledlg.obj &
+       $(OBJS)\richtextlib_richtextprint.obj
 GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_GL /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL &
+       /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)
 GLDLL_OBJECTS =  &
        $(OBJS)\gldll_dummy.obj &
        $(OBJS)\gldll_glcanvas.obj
 GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 GLLIB_OBJECTS =  &
        $(OBJS)\gllib_dummy.obj &
        $(OBJS)\gllib_glcanvas.obj
@@ -3909,7 +4082,7 @@ $(SETUPHDIR)\wx\setup.h :
 
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
-       @echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE)
+       @echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE)
        @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@@ -3931,6 +4104,7 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @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=wat >>$(BUILD_CFG_FILE)
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)
        @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
@@ -4296,6 +4470,12 @@ $(OBJS)\monodll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\monodll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_arcall.obj :  .AUTODEPEND ..\..\src\common\arcall.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_arcfind.obj :  .AUTODEPEND ..\..\src\common\arcfind.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -4341,6 +4521,9 @@ $(OBJS)\monodll_ffile.obj :  .AUTODEPEND ..\..\src\common\ffile.cpp
 $(OBJS)\monodll_file.obj :  .AUTODEPEND ..\..\src\common\file.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_fileback.obj :  .AUTODEPEND ..\..\src\common\fileback.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_fileconf.obj :  .AUTODEPEND ..\..\src\common\fileconf.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -4353,10 +4536,19 @@ $(OBJS)\monodll_filename.obj :  .AUTODEPEND ..\..\src\common\filename.cpp
 $(OBJS)\monodll_filesys.obj :  .AUTODEPEND ..\..\src\common\filesys.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_filtall.obj :  .AUTODEPEND ..\..\src\common\filtall.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_filtfind.obj :  .AUTODEPEND ..\..\src\common\filtfind.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_fmapbase.obj :  .AUTODEPEND ..\..\src\common\fmapbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_fs_zip.obj :  .AUTODEPEND ..\..\src\common\fs_zip.cpp
+$(OBJS)\monodll_fs_arc.obj :  .AUTODEPEND ..\..\src\common\fs_arc.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_fs_filter.obj :  .AUTODEPEND ..\..\src\common\fs_filter.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_hash.obj :  .AUTODEPEND ..\..\src\common\hash.cpp
@@ -4431,6 +4623,9 @@ $(OBJS)\monodll_string.obj :  .AUTODEPEND ..\..\src\common\string.cpp
 $(OBJS)\monodll_sysopt.obj :  .AUTODEPEND ..\..\src\common\sysopt.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_tarstrm.obj :  .AUTODEPEND ..\..\src\common\tarstrm.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -4815,6 +5010,9 @@ $(OBJS)\monodll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monodll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -4845,6 +5043,9 @@ $(OBJS)\monodll_xh_choicbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\monodll_xh_clrpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -4917,6 +5118,9 @@ $(OBJS)\monodll_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\monodll_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -5001,6 +5205,18 @@ $(OBJS)\monodll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cp
 $(OBJS)\monodll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -5406,6 +5622,11 @@ $(OBJS)\monodll_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5496,6 +5717,16 @@ $(OBJS)\monodll_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_dcgraph.obj :  .AUTODEPEND ..\..\src\common\dcgraph.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5606,6 +5837,11 @@ $(OBJS)\monodll_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5666,6 +5902,11 @@ $(OBJS)\monodll_imagpnm.obj :  .AUTODEPEND ..\..\src\common\imagpnm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_imagtga.obj :  .AUTODEPEND ..\..\src\common\imagtga.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_imagtiff.obj :  .AUTODEPEND ..\..\src\common\imagtiff.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5706,6 +5947,11 @@ $(OBJS)\monodll_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5756,6 +6002,11 @@ $(OBJS)\monodll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5841,6 +6092,11 @@ $(OBJS)\monodll_clrpickerg.obj :  .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_combog.obj :  .AUTODEPEND ..\..\src\generic\combog.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5926,6 +6182,11 @@ $(OBJS)\monodll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5961,11 +6222,26 @@ $(OBJS)\monodll_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6062,6 +6338,12 @@ $(OBJS)\monolib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\monolib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_arcall.obj :  .AUTODEPEND ..\..\src\common\arcall.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_arcfind.obj :  .AUTODEPEND ..\..\src\common\arcfind.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -6107,6 +6389,9 @@ $(OBJS)\monolib_ffile.obj :  .AUTODEPEND ..\..\src\common\ffile.cpp
 $(OBJS)\monolib_file.obj :  .AUTODEPEND ..\..\src\common\file.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_fileback.obj :  .AUTODEPEND ..\..\src\common\fileback.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_fileconf.obj :  .AUTODEPEND ..\..\src\common\fileconf.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -6119,10 +6404,19 @@ $(OBJS)\monolib_filename.obj :  .AUTODEPEND ..\..\src\common\filename.cpp
 $(OBJS)\monolib_filesys.obj :  .AUTODEPEND ..\..\src\common\filesys.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_filtall.obj :  .AUTODEPEND ..\..\src\common\filtall.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_filtfind.obj :  .AUTODEPEND ..\..\src\common\filtfind.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_fmapbase.obj :  .AUTODEPEND ..\..\src\common\fmapbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_fs_zip.obj :  .AUTODEPEND ..\..\src\common\fs_zip.cpp
+$(OBJS)\monolib_fs_arc.obj :  .AUTODEPEND ..\..\src\common\fs_arc.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_fs_filter.obj :  .AUTODEPEND ..\..\src\common\fs_filter.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_hash.obj :  .AUTODEPEND ..\..\src\common\hash.cpp
@@ -6197,6 +6491,9 @@ $(OBJS)\monolib_string.obj :  .AUTODEPEND ..\..\src\common\string.cpp
 $(OBJS)\monolib_sysopt.obj :  .AUTODEPEND ..\..\src\common\sysopt.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_tarstrm.obj :  .AUTODEPEND ..\..\src\common\tarstrm.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -6581,6 +6878,9 @@ $(OBJS)\monolib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monolib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -6611,6 +6911,9 @@ $(OBJS)\monolib_xh_choicbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\monolib_xh_clrpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -6683,6 +6986,9 @@ $(OBJS)\monolib_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\monolib_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -6767,6 +7073,18 @@ $(OBJS)\monolib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cp
 $(OBJS)\monolib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -7172,6 +7490,11 @@ $(OBJS)\monolib_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7262,6 +7585,16 @@ $(OBJS)\monolib_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_dcgraph.obj :  .AUTODEPEND ..\..\src\common\dcgraph.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7372,6 +7705,11 @@ $(OBJS)\monolib_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7432,6 +7770,11 @@ $(OBJS)\monolib_imagpnm.obj :  .AUTODEPEND ..\..\src\common\imagpnm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_imagtga.obj :  .AUTODEPEND ..\..\src\common\imagtga.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_imagtiff.obj :  .AUTODEPEND ..\..\src\common\imagtiff.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7472,6 +7815,11 @@ $(OBJS)\monolib_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7522,6 +7870,11 @@ $(OBJS)\monolib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7607,6 +7960,11 @@ $(OBJS)\monolib_clrpickerg.obj :  .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_combog.obj :  .AUTODEPEND ..\..\src\generic\combog.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7692,6 +8050,11 @@ $(OBJS)\monolib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7727,11 +8090,26 @@ $(OBJS)\monolib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7828,6 +8206,12 @@ $(OBJS)\basedll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_arcall.obj :  .AUTODEPEND ..\..\src\common\arcall.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
+$(OBJS)\basedll_arcfind.obj :  .AUTODEPEND ..\..\src\common\arcfind.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -7873,6 +8257,9 @@ $(OBJS)\basedll_ffile.obj :  .AUTODEPEND ..\..\src\common\ffile.cpp
 $(OBJS)\basedll_file.obj :  .AUTODEPEND ..\..\src\common\file.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_fileback.obj :  .AUTODEPEND ..\..\src\common\fileback.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_fileconf.obj :  .AUTODEPEND ..\..\src\common\fileconf.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -7885,10 +8272,19 @@ $(OBJS)\basedll_filename.obj :  .AUTODEPEND ..\..\src\common\filename.cpp
 $(OBJS)\basedll_filesys.obj :  .AUTODEPEND ..\..\src\common\filesys.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_filtall.obj :  .AUTODEPEND ..\..\src\common\filtall.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
+$(OBJS)\basedll_filtfind.obj :  .AUTODEPEND ..\..\src\common\filtfind.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_fmapbase.obj :  .AUTODEPEND ..\..\src\common\fmapbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
-$(OBJS)\basedll_fs_zip.obj :  .AUTODEPEND ..\..\src\common\fs_zip.cpp
+$(OBJS)\basedll_fs_arc.obj :  .AUTODEPEND ..\..\src\common\fs_arc.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
+$(OBJS)\basedll_fs_filter.obj :  .AUTODEPEND ..\..\src\common\fs_filter.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_hash.obj :  .AUTODEPEND ..\..\src\common\hash.cpp
@@ -7963,6 +8359,9 @@ $(OBJS)\basedll_string.obj :  .AUTODEPEND ..\..\src\common\string.cpp
 $(OBJS)\basedll_sysopt.obj :  .AUTODEPEND ..\..\src\common\sysopt.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_tarstrm.obj :  .AUTODEPEND ..\..\src\common\tarstrm.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -8035,6 +8434,12 @@ $(OBJS)\baselib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\baselib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_arcall.obj :  .AUTODEPEND ..\..\src\common\arcall.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
+$(OBJS)\baselib_arcfind.obj :  .AUTODEPEND ..\..\src\common\arcfind.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -8080,6 +8485,9 @@ $(OBJS)\baselib_ffile.obj :  .AUTODEPEND ..\..\src\common\ffile.cpp
 $(OBJS)\baselib_file.obj :  .AUTODEPEND ..\..\src\common\file.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_fileback.obj :  .AUTODEPEND ..\..\src\common\fileback.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_fileconf.obj :  .AUTODEPEND ..\..\src\common\fileconf.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -8092,10 +8500,19 @@ $(OBJS)\baselib_filename.obj :  .AUTODEPEND ..\..\src\common\filename.cpp
 $(OBJS)\baselib_filesys.obj :  .AUTODEPEND ..\..\src\common\filesys.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_filtall.obj :  .AUTODEPEND ..\..\src\common\filtall.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
+$(OBJS)\baselib_filtfind.obj :  .AUTODEPEND ..\..\src\common\filtfind.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_fmapbase.obj :  .AUTODEPEND ..\..\src\common\fmapbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
-$(OBJS)\baselib_fs_zip.obj :  .AUTODEPEND ..\..\src\common\fs_zip.cpp
+$(OBJS)\baselib_fs_arc.obj :  .AUTODEPEND ..\..\src\common\fs_arc.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
+$(OBJS)\baselib_fs_filter.obj :  .AUTODEPEND ..\..\src\common\fs_filter.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_hash.obj :  .AUTODEPEND ..\..\src\common\hash.cpp
@@ -8170,6 +8587,9 @@ $(OBJS)\baselib_string.obj :  .AUTODEPEND ..\..\src\common\string.cpp
 $(OBJS)\baselib_sysopt.obj :  .AUTODEPEND ..\..\src\common\sysopt.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_tarstrm.obj :  .AUTODEPEND ..\..\src\common\tarstrm.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -8920,6 +9340,11 @@ $(OBJS)\coredll_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9010,6 +9435,16 @@ $(OBJS)\coredll_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_dcgraph.obj :  .AUTODEPEND ..\..\src\common\dcgraph.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9120,6 +9555,11 @@ $(OBJS)\coredll_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9180,6 +9620,11 @@ $(OBJS)\coredll_imagpnm.obj :  .AUTODEPEND ..\..\src\common\imagpnm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_imagtga.obj :  .AUTODEPEND ..\..\src\common\imagtga.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_imagtiff.obj :  .AUTODEPEND ..\..\src\common\imagtiff.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9220,6 +9665,11 @@ $(OBJS)\coredll_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9270,6 +9720,11 @@ $(OBJS)\coredll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9355,6 +9810,11 @@ $(OBJS)\coredll_clrpickerg.obj :  .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_combog.obj :  .AUTODEPEND ..\..\src\generic\combog.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9440,6 +9900,11 @@ $(OBJS)\coredll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\coredll_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -10087,6 +10552,11 @@ $(OBJS)\corelib_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10177,6 +10647,16 @@ $(OBJS)\corelib_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_dcgraph.obj :  .AUTODEPEND ..\..\src\common\dcgraph.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10287,6 +10767,11 @@ $(OBJS)\corelib_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10347,6 +10832,11 @@ $(OBJS)\corelib_imagpnm.obj :  .AUTODEPEND ..\..\src\common\imagpnm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_imagtga.obj :  .AUTODEPEND ..\..\src\common\imagtga.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_imagtiff.obj :  .AUTODEPEND ..\..\src\common\imagtiff.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10387,6 +10877,11 @@ $(OBJS)\corelib_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10437,6 +10932,11 @@ $(OBJS)\corelib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10522,6 +11022,11 @@ $(OBJS)\corelib_clrpickerg.obj :  .AUTODEPEND ..\..\src\generic\clrpickerg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_combog.obj :  .AUTODEPEND ..\..\src\generic\combog.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10607,6 +11112,11 @@ $(OBJS)\corelib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\corelib_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -10645,9 +11155,18 @@ $(OBJS)\corelib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
 $(OBJS)\advdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
+$(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
+$(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -10705,9 +11224,18 @@ $(OBJS)\advdll_sound.obj :  .AUTODEPEND ..\..\src\os2\sound.cpp
 $(OBJS)\advlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
+$(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
+$(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -10987,6 +11515,9 @@ $(OBJS)\xmllib_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
 $(OBJS)\xrcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
+$(OBJS)\xrcdll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -11017,6 +11548,9 @@ $(OBJS)\xrcdll_xh_choicbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\xrcdll_xh_clrpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
+$(OBJS)\xrcdll_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -11089,6 +11623,9 @@ $(OBJS)\xrcdll_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\xrcdll_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
+$(OBJS)\xrcdll_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -11146,6 +11683,9 @@ $(OBJS)\xrcdll_xmlrsall.obj :  .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
 $(OBJS)\xrclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
+$(OBJS)\xrclib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
@@ -11176,6 +11716,9 @@ $(OBJS)\xrclib_xh_choicbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\xrclib_xh_clrpicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
+$(OBJS)\xrclib_xh_collpane.obj :  .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_combo.obj :  .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
@@ -11248,6 +11791,9 @@ $(OBJS)\xrclib_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\xrclib_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
+$(OBJS)\xrclib_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
@@ -11356,6 +11902,18 @@ $(OBJS)\richtextdll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxm
 $(OBJS)\richtextdll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
 
+$(OBJS)\richtextdll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
+
+$(OBJS)\richtextdll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
+
+$(OBJS)\richtextdll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
+
+$(OBJS)\richtextdll_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
+
 $(OBJS)\richtextlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
 
@@ -11374,6 +11932,18 @@ $(OBJS)\richtextlib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxm
 $(OBJS)\richtextlib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
 
+$(OBJS)\richtextlib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
+
+$(OBJS)\richtextlib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
+
+$(OBJS)\richtextlib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
+
+$(OBJS)\richtextlib_richtextprint.obj :  .AUTODEPEND ..\..\src\richtext\richtextprint.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
+
 $(OBJS)\gldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<