regenerated after last changes

[wxWidgets.git] / build / msw / makefile.vc

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 0856dc725b1f959204f16777eb099a6eba4e76fb..b3830ed70884faef3e61d6e5bca00b0071545b31 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -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!
 # =========================================================================
 
@@ -28,7 +28,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 27
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
 LIBDIRNAME = ..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
@@ -204,6 +204,8 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        $(OBJS)\monodll_version.res \
        $(OBJS)\monodll_appbase.obj \
+       $(OBJS)\monodll_arcall.obj \
+       $(OBJS)\monodll_arcfind.obj \
        $(OBJS)\monodll_archive.obj \
        $(OBJS)\monodll_clntdata.obj \
        $(OBJS)\monodll_cmdline.obj \
@@ -227,8 +229,8 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_filtall.obj \
        $(OBJS)\monodll_filtfind.obj \
        $(OBJS)\monodll_fmapbase.obj \
+       $(OBJS)\monodll_fs_arc.obj \
        $(OBJS)\monodll_fs_filter.obj \
-       $(OBJS)\monodll_fs_zip.obj \
        $(OBJS)\monodll_hash.obj \
        $(OBJS)\monodll_hashmap.obj \
        $(OBJS)\monodll_init.obj \
@@ -253,6 +255,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 \
@@ -326,6 +329,8 @@ MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
 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 \
@@ -349,8 +354,8 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_filtall.obj \
        $(OBJS)\monolib_filtfind.obj \
        $(OBJS)\monolib_fmapbase.obj \
+       $(OBJS)\monolib_fs_arc.obj \
        $(OBJS)\monolib_fs_filter.obj \
-       $(OBJS)\monolib_fs_zip.obj \
        $(OBJS)\monolib_hash.obj \
        $(OBJS)\monolib_hashmap.obj \
        $(OBJS)\monolib_init.obj \
@@ -375,6 +380,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 \
@@ -450,6 +456,8 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_version.res \
        $(OBJS)\basedll_appbase.obj \
+       $(OBJS)\basedll_arcall.obj \
+       $(OBJS)\basedll_arcfind.obj \
        $(OBJS)\basedll_archive.obj \
        $(OBJS)\basedll_clntdata.obj \
        $(OBJS)\basedll_cmdline.obj \
@@ -473,8 +481,8 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_filtall.obj \
        $(OBJS)\basedll_filtfind.obj \
        $(OBJS)\basedll_fmapbase.obj \
+       $(OBJS)\basedll_fs_arc.obj \
        $(OBJS)\basedll_fs_filter.obj \
-       $(OBJS)\basedll_fs_zip.obj \
        $(OBJS)\basedll_hash.obj \
        $(OBJS)\basedll_hashmap.obj \
        $(OBJS)\basedll_init.obj \
@@ -499,6 +507,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 \
@@ -558,6 +567,8 @@ BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
 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 \
@@ -581,8 +592,8 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_filtall.obj \
        $(OBJS)\baselib_filtfind.obj \
        $(OBJS)\baselib_fmapbase.obj \
+       $(OBJS)\baselib_fs_arc.obj \
        $(OBJS)\baselib_fs_filter.obj \
-       $(OBJS)\baselib_fs_zip.obj \
        $(OBJS)\baselib_hash.obj \
        $(OBJS)\baselib_hashmap.obj \
        $(OBJS)\baselib_init.obj \
@@ -607,6 +618,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 \
@@ -781,6 +793,7 @@ MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_mediactrlcmn.obj \
        $(OBJS)\mediadll_mediactrl_am.obj \
        $(OBJS)\mediadll_mediactrl_wmp10.obj \
+       $(OBJS)\mediadll_mediactrl_qt.obj \
        $(OBJS)\mediadll_activex.obj
 MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
@@ -797,6 +810,7 @@ MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_mediactrlcmn.obj \
        $(OBJS)\medialib_mediactrl_am.obj \
        $(OBJS)\medialib_mediactrl_wmp10.obj \
+       $(OBJS)\medialib_mediactrl_qt.obj \
        $(OBJS)\medialib_activex.obj
 ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_249)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
@@ -1017,6 +1031,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 \
@@ -1083,6 +1098,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 \
@@ -1364,6 +1380,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_mediactrlcmn.obj \
        $(OBJS)\monodll_mediactrl_am.obj \
        $(OBJS)\monodll_mediactrl_wmp10.obj \
+       $(OBJS)\monodll_mediactrl_qt.obj \
        $(OBJS)\monodll_activex.obj \
        $(OBJS)\monodll_helpbest.obj \
        $(OBJS)\monodll_helpctrl.obj \
@@ -1405,6 +1422,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 \
@@ -1620,6 +1638,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 \
@@ -1656,6 +1675,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 \
@@ -1841,6 +1861,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 \
@@ -1877,6 +1898,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 \
@@ -1907,9 +1929,9 @@ ____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_collpaneg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_grid.obj \
@@ -1924,7 +1946,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_splash.obj \
        $(OBJS)\monodll_tipdlg.obj \
        $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_animateg.obj \
        $(OBJS)\monodll_taskbarcmn.obj \
        $(OBJS)\monodll_aboutdlg.obj \
        $(OBJS)\monodll_sound.obj \
@@ -1937,9 +1958,9 @@ ____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_collpaneg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_grid.obj \
@@ -1954,7 +1975,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_splash.obj \
        $(OBJS)\monodll_tipdlg.obj \
        $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_animateg.obj \
        $(OBJS)\monodll_taskbarcmn.obj \
        $(OBJS)\monodll_aboutdlg.obj \
        $(OBJS)\monodll_sound.obj \
@@ -1978,6 +1998,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_mediactrlcmn.obj \
        $(OBJS)\monolib_mediactrl_am.obj \
        $(OBJS)\monolib_mediactrl_wmp10.obj \
+       $(OBJS)\monolib_mediactrl_qt.obj \
        $(OBJS)\monolib_activex.obj \
        $(OBJS)\monolib_helpbest.obj \
        $(OBJS)\monolib_helpctrl.obj \
@@ -2019,6 +2040,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 \
@@ -2234,6 +2256,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 \
@@ -2270,6 +2293,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 \
@@ -2455,6 +2479,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 \
@@ -2491,6 +2516,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 \
@@ -2521,9 +2547,9 @@ ____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_collpaneg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_grid.obj \
@@ -2538,7 +2564,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_splash.obj \
        $(OBJS)\monolib_tipdlg.obj \
        $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_animateg.obj \
        $(OBJS)\monolib_taskbarcmn.obj \
        $(OBJS)\monolib_aboutdlg.obj \
        $(OBJS)\monolib_sound.obj \
@@ -2551,9 +2576,9 @@ ____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_collpaneg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_grid.obj \
@@ -2568,7 +2593,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_splash.obj \
        $(OBJS)\monolib_tipdlg.obj \
        $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_animateg.obj \
        $(OBJS)\monolib_taskbarcmn.obj \
        $(OBJS)\monolib_aboutdlg.obj \
        $(OBJS)\monolib_sound.obj \
@@ -2782,6 +2806,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 \
@@ -2818,6 +2843,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 \
@@ -3003,6 +3029,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 \
@@ -3039,6 +3066,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 \
@@ -3231,6 +3259,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 \
@@ -3267,6 +3296,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 \
@@ -3452,6 +3482,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 \
@@ -3488,6 +3519,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 \
@@ -3528,9 +3560,9 @@ ____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_collpaneg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_grid.obj \
@@ -3545,7 +3577,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_splash.obj \
        $(OBJS)\advdll_tipdlg.obj \
        $(OBJS)\advdll_wizard.obj \
-       $(OBJS)\advdll_animateg.obj \
        $(OBJS)\advdll_taskbarcmn.obj \
        $(OBJS)\advdll_aboutdlg.obj \
        $(OBJS)\advdll_sound.obj \
@@ -3558,9 +3589,9 @@ ____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_collpaneg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_grid.obj \
@@ -3575,7 +3606,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_splash.obj \
        $(OBJS)\advdll_tipdlg.obj \
        $(OBJS)\advdll_wizard.obj \
-       $(OBJS)\advdll_animateg.obj \
        $(OBJS)\advdll_taskbarcmn.obj \
        $(OBJS)\advdll_aboutdlg.obj \
        $(OBJS)\advdll_sound.obj \
@@ -3597,9 +3627,9 @@ ____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_collpaneg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_grid.obj \
@@ -3614,7 +3644,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_splash.obj \
        $(OBJS)\advlib_tipdlg.obj \
        $(OBJS)\advlib_wizard.obj \
-       $(OBJS)\advlib_animateg.obj \
        $(OBJS)\advlib_taskbarcmn.obj \
        $(OBJS)\advlib_aboutdlg.obj \
        $(OBJS)\advlib_sound.obj \
@@ -3627,9 +3656,9 @@ ____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_collpaneg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_grid.obj \
@@ -3644,7 +3673,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_splash.obj \
        $(OBJS)\advlib_tipdlg.obj \
        $(OBJS)\advlib_wizard.obj \
-       $(OBJS)\advlib_animateg.obj \
        $(OBJS)\advlib_taskbarcmn.obj \
        $(OBJS)\advlib_aboutdlg.obj \
        $(OBJS)\advlib_sound.obj \
@@ -4431,7 +4459,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
        @echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE)
-       @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -4821,6 +4849,12 @@ $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -4890,10 +4924,10 @@ $(OBJS)\monodll_filtfind.obj: ..\..\src\common\filtfind.cpp
 $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
+$(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp
@@ -4968,6 +5002,9 @@ $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp
 $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5262,6 +5299,9 @@ $(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -5385,6 +5425,9 @@ $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -6352,6 +6395,11 @@ $(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6532,6 +6580,11 @@ $(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6668,17 +6721,17 @@ $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
+$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
@@ -6752,11 +6805,6 @@ $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6788,6 +6836,12 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -6857,10 +6911,10 @@ $(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp
 $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
+$(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp
@@ -6935,6 +6989,9 @@ $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp
 $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -7229,6 +7286,9 @@ $(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -7352,6 +7412,9 @@ $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -8319,6 +8382,11 @@ $(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8499,6 +8567,11 @@ $(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8635,17 +8708,17 @@ $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
+$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
@@ -8719,11 +8792,6 @@ $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8758,6 +8826,12 @@ $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -8827,10 +8901,10 @@ $(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp
 $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
+$(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
-$(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
 $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp
@@ -8905,6 +8979,9 @@ $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp
 $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -9016,6 +9093,12 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
@@ -9085,10 +9168,10 @@ $(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp
 $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
+$(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
-$(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp
+$(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
 $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp
@@ -9163,6 +9246,9 @@ $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp
 $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
@@ -10307,6 +10393,11 @@ $(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -10487,6 +10578,11 @@ $(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -11562,6 +11658,11 @@ $(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11742,6 +11843,11 @@ $(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11880,13 +11986,13 @@ $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
+$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
 $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
@@ -11931,9 +12037,6 @@ $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
-
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -11964,13 +12067,13 @@ $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
+$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
 $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
@@ -12015,9 +12118,6 @@ $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
-
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
@@ -12048,6 +12148,9 @@ $(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
 
+$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
+
 $(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
 
@@ -12063,6 +12166,9 @@ $(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
 $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
 
+$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
+
 $(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
 
@@ -12336,6 +12442,9 @@ $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
+$(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
@@ -12501,6 +12610,9 @@ $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp
 $(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 
+$(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**