X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59068d79f7fcc94d320cf41ce1ed7f0a8851b125..309f2b20311a0ebf665f461ba32f2993abf91d2f:/build/msw/makefile.wat

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 86026d1817..ff89936797 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -189,19 +189,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_xh_split.obj &
 	$(OBJS)\monodll_xh_srchctrl.obj &
 	$(OBJS)\monodll_xh_statbar.obj &
-	$(OBJS)\monodll_xh_stbmp.obj &
-	$(OBJS)\monodll_xh_stbox.obj &
-	$(OBJS)\monodll_xh_stlin.obj &
-	$(OBJS)\monodll_xh_sttxt.obj &
-	$(OBJS)\monodll_xh_text.obj &
-	$(OBJS)\monodll_xh_tglbtn.obj &
-	$(OBJS)\monodll_xh_timectrl.obj &
-	$(OBJS)\monodll_xh_toolb.obj &
-	$(OBJS)\monodll_xh_toolbk.obj &
-	$(OBJS)\monodll_xh_tree.obj &
-	$(OBJS)\monodll_xh_treebk.obj &
-	$(OBJS)\monodll_xh_unkwn.obj &
-	$(OBJS)\monodll_xh_wizrd.obj &
+	$(OBJS)\monodll_xh_stbmp.obj &
+	$(OBJS)\monodll_xh_stbox.obj &
+	$(OBJS)\monodll_xh_stlin.obj &
+	$(OBJS)\monodll_xh_sttxt.obj &
+	$(OBJS)\monodll_xh_text.obj &
+	$(OBJS)\monodll_xh_tglbtn.obj &
+	$(OBJS)\monodll_xh_timectrl.obj &
+	$(OBJS)\monodll_xh_toolb.obj &
+	$(OBJS)\monodll_xh_toolbk.obj &
+	$(OBJS)\monodll_xh_tree.obj &
+	$(OBJS)\monodll_xh_treebk.obj &
+	$(OBJS)\monodll_xh_unkwn.obj &
+	$(OBJS)\monodll_xh_wizrd.obj &
 	$(OBJS)\monodll_xmlres.obj &
 	$(OBJS)\monodll_xmladv.obj &
 	$(OBJS)\monodll_xmlrsall.obj &
@@ -269,19 +269,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_fontenum.obj &
 	$(OBJS)\monodll_fontutil.obj &
 	$(OBJS)\monodll_gdiimage.obj &
-	$(OBJS)\monodll_gdiobj.obj &
-	$(OBJS)\monodll_gdiplus.obj &
-	$(OBJS)\monodll_graphics.obj &
-	$(OBJS)\monodll_icon.obj &
-	$(OBJS)\monodll_imaglist.obj &
-	$(OBJS)\monodll_minifram.obj &
-	$(OBJS)\monodll_nonownedwnd.obj &
-	$(OBJS)\monodll_dataobj.obj &
-	$(OBJS)\monodll_dropsrc.obj &
-	$(OBJS)\monodll_droptgt.obj &
-	$(OBJS)\monodll_oleutils.obj &
-	$(OBJS)\monodll_palette.obj &
-	$(OBJS)\monodll_pen.obj &
+	$(OBJS)\monodll_gdiobj.obj &
+	$(OBJS)\monodll_gdiplus.obj &
+	$(OBJS)\monodll_graphics.obj &
+	$(OBJS)\monodll_icon.obj &
+	$(OBJS)\monodll_imaglist.obj &
+	$(OBJS)\monodll_minifram.obj &
+	$(OBJS)\monodll_nonownedwnd.obj &
+	$(OBJS)\monodll_dataobj.obj &
+	$(OBJS)\monodll_dropsrc.obj &
+	$(OBJS)\monodll_droptgt.obj &
+	$(OBJS)\monodll_oleutils.obj &
+	$(OBJS)\monodll_palette.obj &
+	$(OBJS)\monodll_pen.obj &
 	$(OBJS)\monodll_popupwin.obj &
 	$(OBJS)\monodll_printdlg.obj &
 	$(OBJS)\monodll_printwin.obj &
@@ -543,19 +543,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_fontenum.obj &
 	$(OBJS)\monodll_fontutil.obj &
 	$(OBJS)\monodll_gdiimage.obj &
-	$(OBJS)\monodll_gdiobj.obj &
-	$(OBJS)\monodll_gdiplus.obj &
-	$(OBJS)\monodll_graphics.obj &
-	$(OBJS)\monodll_icon.obj &
-	$(OBJS)\monodll_imaglist.obj &
-	$(OBJS)\monodll_minifram.obj &
-	$(OBJS)\monodll_nonownedwnd.obj &
-	$(OBJS)\monodll_dataobj.obj &
-	$(OBJS)\monodll_dropsrc.obj &
-	$(OBJS)\monodll_droptgt.obj &
-	$(OBJS)\monodll_oleutils.obj &
-	$(OBJS)\monodll_palette.obj &
-	$(OBJS)\monodll_pen.obj &
+	$(OBJS)\monodll_gdiobj.obj &
+	$(OBJS)\monodll_gdiplus.obj &
+	$(OBJS)\monodll_graphics.obj &
+	$(OBJS)\monodll_icon.obj &
+	$(OBJS)\monodll_imaglist.obj &
+	$(OBJS)\monodll_minifram.obj &
+	$(OBJS)\monodll_nonownedwnd.obj &
+	$(OBJS)\monodll_dataobj.obj &
+	$(OBJS)\monodll_dropsrc.obj &
+	$(OBJS)\monodll_droptgt.obj &
+	$(OBJS)\monodll_oleutils.obj &
+	$(OBJS)\monodll_palette.obj &
+	$(OBJS)\monodll_pen.obj &
 	$(OBJS)\monodll_popupwin.obj &
 	$(OBJS)\monodll_printdlg.obj &
 	$(OBJS)\monodll_printwin.obj &
@@ -790,100 +790,100 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_animatecmn.obj &
-	$(OBJS)\monodll_bmpcboxcmn.obj &
-	$(OBJS)\monodll_calctrlcmn.obj &
-	$(OBJS)\monodll_datavcmn.obj &
-	$(OBJS)\monodll_gridcmn.obj &
-	$(OBJS)\monodll_hyperlnkcmn.obj &
-	$(OBJS)\monodll_odcombocmn.obj &
-	$(OBJS)\monodll_richtooltipcmn.obj &
-	$(OBJS)\monodll_aboutdlgg.obj &
-	$(OBJS)\monodll_bannerwindow.obj &
-	$(OBJS)\monodll_bmpcboxg.obj &
-	$(OBJS)\monodll_calctrlg.obj &
-	$(OBJS)\monodll_commandlinkbuttong.obj &
-	$(OBJS)\monodll_datavgen.obj &
+	$(OBJS)\monodll_bmpcboxcmn.obj &
+	$(OBJS)\monodll_calctrlcmn.obj &
+	$(OBJS)\monodll_datavcmn.obj &
+	$(OBJS)\monodll_gridcmn.obj &
+	$(OBJS)\monodll_hyperlnkcmn.obj &
+	$(OBJS)\monodll_odcombocmn.obj &
+	$(OBJS)\monodll_richtooltipcmn.obj &
+	$(OBJS)\monodll_aboutdlgg.obj &
+	$(OBJS)\monodll_bannerwindow.obj &
+	$(OBJS)\monodll_bmpcboxg.obj &
+	$(OBJS)\monodll_calctrlg.obj &
+	$(OBJS)\monodll_commandlinkbuttong.obj &
+	$(OBJS)\monodll_datavgen.obj &
 	$(OBJS)\monodll_datectlg.obj &
 	$(OBJS)\monodll_editlbox.obj &
 	$(OBJS)\monodll_grid.obj &
 	$(OBJS)\monodll_gridctrl.obj &
 	$(OBJS)\monodll_grideditors.obj &
 	$(OBJS)\monodll_gridsel.obj &
-	$(OBJS)\monodll_helpext.obj &
-	$(OBJS)\monodll_hyperlinkg.obj &
-	$(OBJS)\monodll_laywin.obj &
-	$(OBJS)\monodll_notifmsgg.obj &
-	$(OBJS)\monodll_odcombo.obj &
-	$(OBJS)\monodll_propdlg.obj &
-	$(OBJS)\monodll_generic_richtooltip.obj &
-	$(OBJS)\monodll_sashwin.obj &
-	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_generic_timectrl.obj &
-	$(OBJS)\monodll_tipdlg.obj &
-	$(OBJS)\monodll_treelist.obj &
-	$(OBJS)\monodll_wizard.obj &
-	$(OBJS)\monodll_taskbarcmn.obj &
-	$(OBJS)\monodll_aboutdlg.obj &
-	$(OBJS)\monodll_notifmsg.obj &
-	$(OBJS)\monodll_msw_richtooltip.obj &
-	$(OBJS)\monodll_sound.obj &
-	$(OBJS)\monodll_taskbar.obj &
-	$(OBJS)\monodll_joystick.obj &
-	$(OBJS)\monodll_animateg.obj &
-	$(OBJS)\monodll_bmpcbox.obj &
-	$(OBJS)\monodll_calctrl.obj &
-	$(OBJS)\monodll_commandlinkbutton.obj &
-	$(OBJS)\monodll_datecontrols.obj &
-	$(OBJS)\monodll_datectrl.obj &
-	$(OBJS)\monodll_datetimectrl.obj &
-	$(OBJS)\monodll_hyperlink.obj &
-	$(OBJS)\monodll_msw_timectrl.obj
-!endif
-!ifeq WXUNIV 1
-____ADVANCED_SRC_FILENAMES_OBJECTS =  &
-	$(OBJS)\monodll_animatecmn.obj &
-	$(OBJS)\monodll_bmpcboxcmn.obj &
-	$(OBJS)\monodll_calctrlcmn.obj &
-	$(OBJS)\monodll_datavcmn.obj &
-	$(OBJS)\monodll_gridcmn.obj &
-	$(OBJS)\monodll_hyperlnkcmn.obj &
-	$(OBJS)\monodll_odcombocmn.obj &
-	$(OBJS)\monodll_richtooltipcmn.obj &
-	$(OBJS)\monodll_aboutdlgg.obj &
-	$(OBJS)\monodll_bannerwindow.obj &
-	$(OBJS)\monodll_bmpcboxg.obj &
-	$(OBJS)\monodll_calctrlg.obj &
-	$(OBJS)\monodll_commandlinkbuttong.obj &
-	$(OBJS)\monodll_datavgen.obj &
+	$(OBJS)\monodll_helpext.obj &
+	$(OBJS)\monodll_hyperlinkg.obj &
+	$(OBJS)\monodll_laywin.obj &
+	$(OBJS)\monodll_notifmsgg.obj &
+	$(OBJS)\monodll_odcombo.obj &
+	$(OBJS)\monodll_propdlg.obj &
+	$(OBJS)\monodll_richtooltipg.obj &
+	$(OBJS)\monodll_sashwin.obj &
+	$(OBJS)\monodll_splash.obj &
+	$(OBJS)\monodll_timectrlg.obj &
+	$(OBJS)\monodll_tipdlg.obj &
+	$(OBJS)\monodll_treelist.obj &
+	$(OBJS)\monodll_wizard.obj &
+	$(OBJS)\monodll_taskbarcmn.obj &
+	$(OBJS)\monodll_aboutdlg.obj &
+	$(OBJS)\monodll_notifmsg.obj &
+	$(OBJS)\monodll_richtooltip.obj &
+	$(OBJS)\monodll_sound.obj &
+	$(OBJS)\monodll_taskbar.obj &
+	$(OBJS)\monodll_joystick.obj &
+	$(OBJS)\monodll_animateg.obj &
+	$(OBJS)\monodll_bmpcbox.obj &
+	$(OBJS)\monodll_calctrl.obj &
+	$(OBJS)\monodll_commandlinkbutton.obj &
+	$(OBJS)\monodll_datecontrols.obj &
+	$(OBJS)\monodll_datectrl.obj &
+	$(OBJS)\monodll_datetimectrl.obj &
+	$(OBJS)\monodll_hyperlink.obj &
+	$(OBJS)\monodll_timectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_OBJECTS =  &
+	$(OBJS)\monodll_animatecmn.obj &
+	$(OBJS)\monodll_bmpcboxcmn.obj &
+	$(OBJS)\monodll_calctrlcmn.obj &
+	$(OBJS)\monodll_datavcmn.obj &
+	$(OBJS)\monodll_gridcmn.obj &
+	$(OBJS)\monodll_hyperlnkcmn.obj &
+	$(OBJS)\monodll_odcombocmn.obj &
+	$(OBJS)\monodll_richtooltipcmn.obj &
+	$(OBJS)\monodll_aboutdlgg.obj &
+	$(OBJS)\monodll_bannerwindow.obj &
+	$(OBJS)\monodll_bmpcboxg.obj &
+	$(OBJS)\monodll_calctrlg.obj &
+	$(OBJS)\monodll_commandlinkbuttong.obj &
+	$(OBJS)\monodll_datavgen.obj &
 	$(OBJS)\monodll_datectlg.obj &
 	$(OBJS)\monodll_editlbox.obj &
 	$(OBJS)\monodll_grid.obj &
 	$(OBJS)\monodll_gridctrl.obj &
 	$(OBJS)\monodll_grideditors.obj &
 	$(OBJS)\monodll_gridsel.obj &
-	$(OBJS)\monodll_helpext.obj &
-	$(OBJS)\monodll_hyperlinkg.obj &
-	$(OBJS)\monodll_laywin.obj &
-	$(OBJS)\monodll_notifmsgg.obj &
-	$(OBJS)\monodll_odcombo.obj &
-	$(OBJS)\monodll_propdlg.obj &
-	$(OBJS)\monodll_generic_richtooltip.obj &
-	$(OBJS)\monodll_sashwin.obj &
-	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_generic_timectrl.obj &
-	$(OBJS)\monodll_tipdlg.obj &
-	$(OBJS)\monodll_treelist.obj &
-	$(OBJS)\monodll_wizard.obj &
-	$(OBJS)\monodll_taskbarcmn.obj &
-	$(OBJS)\monodll_aboutdlg.obj &
-	$(OBJS)\monodll_notifmsg.obj &
-	$(OBJS)\monodll_msw_richtooltip.obj &
-	$(OBJS)\monodll_sound.obj &
-	$(OBJS)\monodll_taskbar.obj &
-	$(OBJS)\monodll_joystick.obj &
-	$(OBJS)\monodll_animateg.obj
-!endif
-__wxscintilla_library_link_DEP =
+	$(OBJS)\monodll_helpext.obj &
+	$(OBJS)\monodll_hyperlinkg.obj &
+	$(OBJS)\monodll_laywin.obj &
+	$(OBJS)\monodll_notifmsgg.obj &
+	$(OBJS)\monodll_odcombo.obj &
+	$(OBJS)\monodll_propdlg.obj &
+	$(OBJS)\monodll_richtooltipg.obj &
+	$(OBJS)\monodll_sashwin.obj &
+	$(OBJS)\monodll_splash.obj &
+	$(OBJS)\monodll_timectrlg.obj &
+	$(OBJS)\monodll_tipdlg.obj &
+	$(OBJS)\monodll_treelist.obj &
+	$(OBJS)\monodll_wizard.obj &
+	$(OBJS)\monodll_taskbarcmn.obj &
+	$(OBJS)\monodll_aboutdlg.obj &
+	$(OBJS)\monodll_notifmsg.obj &
+	$(OBJS)\monodll_richtooltip.obj &
+	$(OBJS)\monodll_sound.obj &
+	$(OBJS)\monodll_taskbar.obj &
+	$(OBJS)\monodll_joystick.obj &
+	$(OBJS)\monodll_animateg.obj
+!endif
+__wxscintilla_library_link_DEP =
 !ifeq USE_STC 1
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 !endif
@@ -983,19 +983,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_xh_split.obj &
 	$(OBJS)\monolib_xh_srchctrl.obj &
 	$(OBJS)\monolib_xh_statbar.obj &
-	$(OBJS)\monolib_xh_stbmp.obj &
-	$(OBJS)\monolib_xh_stbox.obj &
-	$(OBJS)\monolib_xh_stlin.obj &
-	$(OBJS)\monolib_xh_sttxt.obj &
-	$(OBJS)\monolib_xh_text.obj &
-	$(OBJS)\monolib_xh_tglbtn.obj &
-	$(OBJS)\monolib_xh_timectrl.obj &
-	$(OBJS)\monolib_xh_toolb.obj &
-	$(OBJS)\monolib_xh_toolbk.obj &
-	$(OBJS)\monolib_xh_tree.obj &
-	$(OBJS)\monolib_xh_treebk.obj &
-	$(OBJS)\monolib_xh_unkwn.obj &
-	$(OBJS)\monolib_xh_wizrd.obj &
+	$(OBJS)\monolib_xh_stbmp.obj &
+	$(OBJS)\monolib_xh_stbox.obj &
+	$(OBJS)\monolib_xh_stlin.obj &
+	$(OBJS)\monolib_xh_sttxt.obj &
+	$(OBJS)\monolib_xh_text.obj &
+	$(OBJS)\monolib_xh_tglbtn.obj &
+	$(OBJS)\monolib_xh_timectrl.obj &
+	$(OBJS)\monolib_xh_toolb.obj &
+	$(OBJS)\monolib_xh_toolbk.obj &
+	$(OBJS)\monolib_xh_tree.obj &
+	$(OBJS)\monolib_xh_treebk.obj &
+	$(OBJS)\monolib_xh_unkwn.obj &
+	$(OBJS)\monolib_xh_wizrd.obj &
 	$(OBJS)\monolib_xmlres.obj &
 	$(OBJS)\monolib_xmladv.obj &
 	$(OBJS)\monolib_xmlrsall.obj &
@@ -1063,19 +1063,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_fontenum.obj &
 	$(OBJS)\monolib_fontutil.obj &
 	$(OBJS)\monolib_gdiimage.obj &
-	$(OBJS)\monolib_gdiobj.obj &
-	$(OBJS)\monolib_gdiplus.obj &
-	$(OBJS)\monolib_graphics.obj &
-	$(OBJS)\monolib_icon.obj &
-	$(OBJS)\monolib_imaglist.obj &
-	$(OBJS)\monolib_minifram.obj &
-	$(OBJS)\monolib_nonownedwnd.obj &
-	$(OBJS)\monolib_dataobj.obj &
-	$(OBJS)\monolib_dropsrc.obj &
-	$(OBJS)\monolib_droptgt.obj &
-	$(OBJS)\monolib_oleutils.obj &
-	$(OBJS)\monolib_palette.obj &
-	$(OBJS)\monolib_pen.obj &
+	$(OBJS)\monolib_gdiobj.obj &
+	$(OBJS)\monolib_gdiplus.obj &
+	$(OBJS)\monolib_graphics.obj &
+	$(OBJS)\monolib_icon.obj &
+	$(OBJS)\monolib_imaglist.obj &
+	$(OBJS)\monolib_minifram.obj &
+	$(OBJS)\monolib_nonownedwnd.obj &
+	$(OBJS)\monolib_dataobj.obj &
+	$(OBJS)\monolib_dropsrc.obj &
+	$(OBJS)\monolib_droptgt.obj &
+	$(OBJS)\monolib_oleutils.obj &
+	$(OBJS)\monolib_palette.obj &
+	$(OBJS)\monolib_pen.obj &
 	$(OBJS)\monolib_popupwin.obj &
 	$(OBJS)\monolib_printdlg.obj &
 	$(OBJS)\monolib_printwin.obj &
@@ -1337,19 +1337,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_fontenum.obj &
 	$(OBJS)\monolib_fontutil.obj &
 	$(OBJS)\monolib_gdiimage.obj &
-	$(OBJS)\monolib_gdiobj.obj &
-	$(OBJS)\monolib_gdiplus.obj &
-	$(OBJS)\monolib_graphics.obj &
-	$(OBJS)\monolib_icon.obj &
-	$(OBJS)\monolib_imaglist.obj &
-	$(OBJS)\monolib_minifram.obj &
-	$(OBJS)\monolib_nonownedwnd.obj &
-	$(OBJS)\monolib_dataobj.obj &
-	$(OBJS)\monolib_dropsrc.obj &
-	$(OBJS)\monolib_droptgt.obj &
-	$(OBJS)\monolib_oleutils.obj &
-	$(OBJS)\monolib_palette.obj &
-	$(OBJS)\monolib_pen.obj &
+	$(OBJS)\monolib_gdiobj.obj &
+	$(OBJS)\monolib_gdiplus.obj &
+	$(OBJS)\monolib_graphics.obj &
+	$(OBJS)\monolib_icon.obj &
+	$(OBJS)\monolib_imaglist.obj &
+	$(OBJS)\monolib_minifram.obj &
+	$(OBJS)\monolib_nonownedwnd.obj &
+	$(OBJS)\monolib_dataobj.obj &
+	$(OBJS)\monolib_dropsrc.obj &
+	$(OBJS)\monolib_droptgt.obj &
+	$(OBJS)\monolib_oleutils.obj &
+	$(OBJS)\monolib_palette.obj &
+	$(OBJS)\monolib_pen.obj &
 	$(OBJS)\monolib_popupwin.obj &
 	$(OBJS)\monolib_printdlg.obj &
 	$(OBJS)\monolib_printwin.obj &
@@ -1584,100 +1584,100 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_animatecmn.obj &
-	$(OBJS)\monolib_bmpcboxcmn.obj &
-	$(OBJS)\monolib_calctrlcmn.obj &
-	$(OBJS)\monolib_datavcmn.obj &
-	$(OBJS)\monolib_gridcmn.obj &
-	$(OBJS)\monolib_hyperlnkcmn.obj &
-	$(OBJS)\monolib_odcombocmn.obj &
-	$(OBJS)\monolib_richtooltipcmn.obj &
-	$(OBJS)\monolib_aboutdlgg.obj &
-	$(OBJS)\monolib_bannerwindow.obj &
-	$(OBJS)\monolib_bmpcboxg.obj &
-	$(OBJS)\monolib_calctrlg.obj &
-	$(OBJS)\monolib_commandlinkbuttong.obj &
-	$(OBJS)\monolib_datavgen.obj &
+	$(OBJS)\monolib_bmpcboxcmn.obj &
+	$(OBJS)\monolib_calctrlcmn.obj &
+	$(OBJS)\monolib_datavcmn.obj &
+	$(OBJS)\monolib_gridcmn.obj &
+	$(OBJS)\monolib_hyperlnkcmn.obj &
+	$(OBJS)\monolib_odcombocmn.obj &
+	$(OBJS)\monolib_richtooltipcmn.obj &
+	$(OBJS)\monolib_aboutdlgg.obj &
+	$(OBJS)\monolib_bannerwindow.obj &
+	$(OBJS)\monolib_bmpcboxg.obj &
+	$(OBJS)\monolib_calctrlg.obj &
+	$(OBJS)\monolib_commandlinkbuttong.obj &
+	$(OBJS)\monolib_datavgen.obj &
 	$(OBJS)\monolib_datectlg.obj &
 	$(OBJS)\monolib_editlbox.obj &
 	$(OBJS)\monolib_grid.obj &
 	$(OBJS)\monolib_gridctrl.obj &
 	$(OBJS)\monolib_grideditors.obj &
 	$(OBJS)\monolib_gridsel.obj &
-	$(OBJS)\monolib_helpext.obj &
-	$(OBJS)\monolib_hyperlinkg.obj &
-	$(OBJS)\monolib_laywin.obj &
-	$(OBJS)\monolib_notifmsgg.obj &
-	$(OBJS)\monolib_odcombo.obj &
-	$(OBJS)\monolib_propdlg.obj &
-	$(OBJS)\monolib_generic_richtooltip.obj &
-	$(OBJS)\monolib_sashwin.obj &
-	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_generic_timectrl.obj &
-	$(OBJS)\monolib_tipdlg.obj &
-	$(OBJS)\monolib_treelist.obj &
-	$(OBJS)\monolib_wizard.obj &
-	$(OBJS)\monolib_taskbarcmn.obj &
-	$(OBJS)\monolib_aboutdlg.obj &
-	$(OBJS)\monolib_notifmsg.obj &
-	$(OBJS)\monolib_msw_richtooltip.obj &
-	$(OBJS)\monolib_sound.obj &
-	$(OBJS)\monolib_taskbar.obj &
-	$(OBJS)\monolib_joystick.obj &
-	$(OBJS)\monolib_animateg.obj &
-	$(OBJS)\monolib_bmpcbox.obj &
-	$(OBJS)\monolib_calctrl.obj &
-	$(OBJS)\monolib_commandlinkbutton.obj &
-	$(OBJS)\monolib_datecontrols.obj &
-	$(OBJS)\monolib_datectrl.obj &
-	$(OBJS)\monolib_datetimectrl.obj &
-	$(OBJS)\monolib_hyperlink.obj &
-	$(OBJS)\monolib_msw_timectrl.obj
-!endif
-!ifeq WXUNIV 1
-____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
-	$(OBJS)\monolib_animatecmn.obj &
-	$(OBJS)\monolib_bmpcboxcmn.obj &
-	$(OBJS)\monolib_calctrlcmn.obj &
-	$(OBJS)\monolib_datavcmn.obj &
-	$(OBJS)\monolib_gridcmn.obj &
-	$(OBJS)\monolib_hyperlnkcmn.obj &
-	$(OBJS)\monolib_odcombocmn.obj &
-	$(OBJS)\monolib_richtooltipcmn.obj &
-	$(OBJS)\monolib_aboutdlgg.obj &
-	$(OBJS)\monolib_bannerwindow.obj &
-	$(OBJS)\monolib_bmpcboxg.obj &
-	$(OBJS)\monolib_calctrlg.obj &
-	$(OBJS)\monolib_commandlinkbuttong.obj &
-	$(OBJS)\monolib_datavgen.obj &
+	$(OBJS)\monolib_helpext.obj &
+	$(OBJS)\monolib_hyperlinkg.obj &
+	$(OBJS)\monolib_laywin.obj &
+	$(OBJS)\monolib_notifmsgg.obj &
+	$(OBJS)\monolib_odcombo.obj &
+	$(OBJS)\monolib_propdlg.obj &
+	$(OBJS)\monolib_richtooltipg.obj &
+	$(OBJS)\monolib_sashwin.obj &
+	$(OBJS)\monolib_splash.obj &
+	$(OBJS)\monolib_timectrlg.obj &
+	$(OBJS)\monolib_tipdlg.obj &
+	$(OBJS)\monolib_treelist.obj &
+	$(OBJS)\monolib_wizard.obj &
+	$(OBJS)\monolib_taskbarcmn.obj &
+	$(OBJS)\monolib_aboutdlg.obj &
+	$(OBJS)\monolib_notifmsg.obj &
+	$(OBJS)\monolib_richtooltip.obj &
+	$(OBJS)\monolib_sound.obj &
+	$(OBJS)\monolib_taskbar.obj &
+	$(OBJS)\monolib_joystick.obj &
+	$(OBJS)\monolib_animateg.obj &
+	$(OBJS)\monolib_bmpcbox.obj &
+	$(OBJS)\monolib_calctrl.obj &
+	$(OBJS)\monolib_commandlinkbutton.obj &
+	$(OBJS)\monolib_datecontrols.obj &
+	$(OBJS)\monolib_datectrl.obj &
+	$(OBJS)\monolib_datetimectrl.obj &
+	$(OBJS)\monolib_hyperlink.obj &
+	$(OBJS)\monolib_timectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
+	$(OBJS)\monolib_animatecmn.obj &
+	$(OBJS)\monolib_bmpcboxcmn.obj &
+	$(OBJS)\monolib_calctrlcmn.obj &
+	$(OBJS)\monolib_datavcmn.obj &
+	$(OBJS)\monolib_gridcmn.obj &
+	$(OBJS)\monolib_hyperlnkcmn.obj &
+	$(OBJS)\monolib_odcombocmn.obj &
+	$(OBJS)\monolib_richtooltipcmn.obj &
+	$(OBJS)\monolib_aboutdlgg.obj &
+	$(OBJS)\monolib_bannerwindow.obj &
+	$(OBJS)\monolib_bmpcboxg.obj &
+	$(OBJS)\monolib_calctrlg.obj &
+	$(OBJS)\monolib_commandlinkbuttong.obj &
+	$(OBJS)\monolib_datavgen.obj &
 	$(OBJS)\monolib_datectlg.obj &
 	$(OBJS)\monolib_editlbox.obj &
 	$(OBJS)\monolib_grid.obj &
 	$(OBJS)\monolib_gridctrl.obj &
 	$(OBJS)\monolib_grideditors.obj &
 	$(OBJS)\monolib_gridsel.obj &
-	$(OBJS)\monolib_helpext.obj &
-	$(OBJS)\monolib_hyperlinkg.obj &
-	$(OBJS)\monolib_laywin.obj &
-	$(OBJS)\monolib_notifmsgg.obj &
-	$(OBJS)\monolib_odcombo.obj &
-	$(OBJS)\monolib_propdlg.obj &
-	$(OBJS)\monolib_generic_richtooltip.obj &
-	$(OBJS)\monolib_sashwin.obj &
-	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_generic_timectrl.obj &
-	$(OBJS)\monolib_tipdlg.obj &
-	$(OBJS)\monolib_treelist.obj &
-	$(OBJS)\monolib_wizard.obj &
-	$(OBJS)\monolib_taskbarcmn.obj &
-	$(OBJS)\monolib_aboutdlg.obj &
-	$(OBJS)\monolib_notifmsg.obj &
-	$(OBJS)\monolib_msw_richtooltip.obj &
-	$(OBJS)\monolib_sound.obj &
-	$(OBJS)\monolib_taskbar.obj &
-	$(OBJS)\monolib_joystick.obj &
-	$(OBJS)\monolib_animateg.obj
-!endif
-__basedll___depname =
+	$(OBJS)\monolib_helpext.obj &
+	$(OBJS)\monolib_hyperlinkg.obj &
+	$(OBJS)\monolib_laywin.obj &
+	$(OBJS)\monolib_notifmsgg.obj &
+	$(OBJS)\monolib_odcombo.obj &
+	$(OBJS)\monolib_propdlg.obj &
+	$(OBJS)\monolib_richtooltipg.obj &
+	$(OBJS)\monolib_sashwin.obj &
+	$(OBJS)\monolib_splash.obj &
+	$(OBJS)\monolib_timectrlg.obj &
+	$(OBJS)\monolib_tipdlg.obj &
+	$(OBJS)\monolib_treelist.obj &
+	$(OBJS)\monolib_wizard.obj &
+	$(OBJS)\monolib_taskbarcmn.obj &
+	$(OBJS)\monolib_aboutdlg.obj &
+	$(OBJS)\monolib_notifmsg.obj &
+	$(OBJS)\monolib_richtooltip.obj &
+	$(OBJS)\monolib_sound.obj &
+	$(OBJS)\monolib_taskbar.obj &
+	$(OBJS)\monolib_joystick.obj &
+	$(OBJS)\monolib_animateg.obj
+!endif
+__basedll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 __basedll___depname = &
@@ -1756,19 +1756,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_fontenum.obj &
 	$(OBJS)\coredll_fontutil.obj &
 	$(OBJS)\coredll_gdiimage.obj &
-	$(OBJS)\coredll_gdiobj.obj &
-	$(OBJS)\coredll_gdiplus.obj &
-	$(OBJS)\coredll_graphics.obj &
-	$(OBJS)\coredll_icon.obj &
-	$(OBJS)\coredll_imaglist.obj &
-	$(OBJS)\coredll_minifram.obj &
-	$(OBJS)\coredll_nonownedwnd.obj &
-	$(OBJS)\coredll_dataobj.obj &
-	$(OBJS)\coredll_dropsrc.obj &
-	$(OBJS)\coredll_droptgt.obj &
-	$(OBJS)\coredll_oleutils.obj &
-	$(OBJS)\coredll_palette.obj &
-	$(OBJS)\coredll_pen.obj &
+	$(OBJS)\coredll_gdiobj.obj &
+	$(OBJS)\coredll_gdiplus.obj &
+	$(OBJS)\coredll_graphics.obj &
+	$(OBJS)\coredll_icon.obj &
+	$(OBJS)\coredll_imaglist.obj &
+	$(OBJS)\coredll_minifram.obj &
+	$(OBJS)\coredll_nonownedwnd.obj &
+	$(OBJS)\coredll_dataobj.obj &
+	$(OBJS)\coredll_dropsrc.obj &
+	$(OBJS)\coredll_droptgt.obj &
+	$(OBJS)\coredll_oleutils.obj &
+	$(OBJS)\coredll_palette.obj &
+	$(OBJS)\coredll_pen.obj &
 	$(OBJS)\coredll_popupwin.obj &
 	$(OBJS)\coredll_printdlg.obj &
 	$(OBJS)\coredll_printwin.obj &
@@ -2030,19 +2030,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_fontenum.obj &
 	$(OBJS)\coredll_fontutil.obj &
 	$(OBJS)\coredll_gdiimage.obj &
-	$(OBJS)\coredll_gdiobj.obj &
-	$(OBJS)\coredll_gdiplus.obj &
-	$(OBJS)\coredll_graphics.obj &
-	$(OBJS)\coredll_icon.obj &
-	$(OBJS)\coredll_imaglist.obj &
-	$(OBJS)\coredll_minifram.obj &
-	$(OBJS)\coredll_nonownedwnd.obj &
-	$(OBJS)\coredll_dataobj.obj &
-	$(OBJS)\coredll_dropsrc.obj &
-	$(OBJS)\coredll_droptgt.obj &
-	$(OBJS)\coredll_oleutils.obj &
-	$(OBJS)\coredll_palette.obj &
-	$(OBJS)\coredll_pen.obj &
+	$(OBJS)\coredll_gdiobj.obj &
+	$(OBJS)\coredll_gdiplus.obj &
+	$(OBJS)\coredll_graphics.obj &
+	$(OBJS)\coredll_icon.obj &
+	$(OBJS)\coredll_imaglist.obj &
+	$(OBJS)\coredll_minifram.obj &
+	$(OBJS)\coredll_nonownedwnd.obj &
+	$(OBJS)\coredll_dataobj.obj &
+	$(OBJS)\coredll_dropsrc.obj &
+	$(OBJS)\coredll_droptgt.obj &
+	$(OBJS)\coredll_oleutils.obj &
+	$(OBJS)\coredll_palette.obj &
+	$(OBJS)\coredll_pen.obj &
 	$(OBJS)\coredll_popupwin.obj &
 	$(OBJS)\coredll_printdlg.obj &
 	$(OBJS)\coredll_printwin.obj &
@@ -2308,19 +2308,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_fontenum.obj &
 	$(OBJS)\corelib_fontutil.obj &
 	$(OBJS)\corelib_gdiimage.obj &
-	$(OBJS)\corelib_gdiobj.obj &
-	$(OBJS)\corelib_gdiplus.obj &
-	$(OBJS)\corelib_graphics.obj &
-	$(OBJS)\corelib_icon.obj &
-	$(OBJS)\corelib_imaglist.obj &
-	$(OBJS)\corelib_minifram.obj &
-	$(OBJS)\corelib_nonownedwnd.obj &
-	$(OBJS)\corelib_dataobj.obj &
-	$(OBJS)\corelib_dropsrc.obj &
-	$(OBJS)\corelib_droptgt.obj &
-	$(OBJS)\corelib_oleutils.obj &
-	$(OBJS)\corelib_palette.obj &
-	$(OBJS)\corelib_pen.obj &
+	$(OBJS)\corelib_gdiobj.obj &
+	$(OBJS)\corelib_gdiplus.obj &
+	$(OBJS)\corelib_graphics.obj &
+	$(OBJS)\corelib_icon.obj &
+	$(OBJS)\corelib_imaglist.obj &
+	$(OBJS)\corelib_minifram.obj &
+	$(OBJS)\corelib_nonownedwnd.obj &
+	$(OBJS)\corelib_dataobj.obj &
+	$(OBJS)\corelib_dropsrc.obj &
+	$(OBJS)\corelib_droptgt.obj &
+	$(OBJS)\corelib_oleutils.obj &
+	$(OBJS)\corelib_palette.obj &
+	$(OBJS)\corelib_pen.obj &
 	$(OBJS)\corelib_popupwin.obj &
 	$(OBJS)\corelib_printdlg.obj &
 	$(OBJS)\corelib_printwin.obj &
@@ -2582,19 +2582,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_fontenum.obj &
 	$(OBJS)\corelib_fontutil.obj &
 	$(OBJS)\corelib_gdiimage.obj &
-	$(OBJS)\corelib_gdiobj.obj &
-	$(OBJS)\corelib_gdiplus.obj &
-	$(OBJS)\corelib_graphics.obj &
-	$(OBJS)\corelib_icon.obj &
-	$(OBJS)\corelib_imaglist.obj &
-	$(OBJS)\corelib_minifram.obj &
-	$(OBJS)\corelib_nonownedwnd.obj &
-	$(OBJS)\corelib_dataobj.obj &
-	$(OBJS)\corelib_dropsrc.obj &
-	$(OBJS)\corelib_droptgt.obj &
-	$(OBJS)\corelib_oleutils.obj &
-	$(OBJS)\corelib_palette.obj &
-	$(OBJS)\corelib_pen.obj &
+	$(OBJS)\corelib_gdiobj.obj &
+	$(OBJS)\corelib_gdiplus.obj &
+	$(OBJS)\corelib_graphics.obj &
+	$(OBJS)\corelib_icon.obj &
+	$(OBJS)\corelib_imaglist.obj &
+	$(OBJS)\corelib_minifram.obj &
+	$(OBJS)\corelib_nonownedwnd.obj &
+	$(OBJS)\corelib_dataobj.obj &
+	$(OBJS)\corelib_dropsrc.obj &
+	$(OBJS)\corelib_droptgt.obj &
+	$(OBJS)\corelib_oleutils.obj &
+	$(OBJS)\corelib_palette.obj &
+	$(OBJS)\corelib_pen.obj &
 	$(OBJS)\corelib_popupwin.obj &
 	$(OBJS)\corelib_printdlg.obj &
 	$(OBJS)\corelib_printwin.obj &
@@ -2846,100 +2846,100 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\advdll_animatecmn.obj &
-	$(OBJS)\advdll_bmpcboxcmn.obj &
-	$(OBJS)\advdll_calctrlcmn.obj &
-	$(OBJS)\advdll_datavcmn.obj &
-	$(OBJS)\advdll_gridcmn.obj &
-	$(OBJS)\advdll_hyperlnkcmn.obj &
-	$(OBJS)\advdll_odcombocmn.obj &
-	$(OBJS)\advdll_richtooltipcmn.obj &
-	$(OBJS)\advdll_aboutdlgg.obj &
-	$(OBJS)\advdll_bannerwindow.obj &
-	$(OBJS)\advdll_bmpcboxg.obj &
-	$(OBJS)\advdll_calctrlg.obj &
-	$(OBJS)\advdll_commandlinkbuttong.obj &
-	$(OBJS)\advdll_datavgen.obj &
+	$(OBJS)\advdll_bmpcboxcmn.obj &
+	$(OBJS)\advdll_calctrlcmn.obj &
+	$(OBJS)\advdll_datavcmn.obj &
+	$(OBJS)\advdll_gridcmn.obj &
+	$(OBJS)\advdll_hyperlnkcmn.obj &
+	$(OBJS)\advdll_odcombocmn.obj &
+	$(OBJS)\advdll_richtooltipcmn.obj &
+	$(OBJS)\advdll_aboutdlgg.obj &
+	$(OBJS)\advdll_bannerwindow.obj &
+	$(OBJS)\advdll_bmpcboxg.obj &
+	$(OBJS)\advdll_calctrlg.obj &
+	$(OBJS)\advdll_commandlinkbuttong.obj &
+	$(OBJS)\advdll_datavgen.obj &
 	$(OBJS)\advdll_datectlg.obj &
 	$(OBJS)\advdll_editlbox.obj &
 	$(OBJS)\advdll_grid.obj &
 	$(OBJS)\advdll_gridctrl.obj &
 	$(OBJS)\advdll_grideditors.obj &
 	$(OBJS)\advdll_gridsel.obj &
-	$(OBJS)\advdll_helpext.obj &
-	$(OBJS)\advdll_hyperlinkg.obj &
-	$(OBJS)\advdll_laywin.obj &
-	$(OBJS)\advdll_notifmsgg.obj &
-	$(OBJS)\advdll_odcombo.obj &
-	$(OBJS)\advdll_propdlg.obj &
-	$(OBJS)\advdll_generic_richtooltip.obj &
-	$(OBJS)\advdll_sashwin.obj &
-	$(OBJS)\advdll_splash.obj &
-	$(OBJS)\advdll_generic_timectrl.obj &
-	$(OBJS)\advdll_tipdlg.obj &
-	$(OBJS)\advdll_treelist.obj &
-	$(OBJS)\advdll_wizard.obj &
-	$(OBJS)\advdll_taskbarcmn.obj &
-	$(OBJS)\advdll_aboutdlg.obj &
-	$(OBJS)\advdll_notifmsg.obj &
-	$(OBJS)\advdll_msw_richtooltip.obj &
-	$(OBJS)\advdll_sound.obj &
-	$(OBJS)\advdll_taskbar.obj &
-	$(OBJS)\advdll_joystick.obj &
-	$(OBJS)\advdll_animateg.obj &
-	$(OBJS)\advdll_bmpcbox.obj &
-	$(OBJS)\advdll_calctrl.obj &
-	$(OBJS)\advdll_commandlinkbutton.obj &
-	$(OBJS)\advdll_datecontrols.obj &
-	$(OBJS)\advdll_datectrl.obj &
-	$(OBJS)\advdll_datetimectrl.obj &
-	$(OBJS)\advdll_hyperlink.obj &
-	$(OBJS)\advdll_msw_timectrl.obj
-!endif
-!ifeq WXUNIV 1
-____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
-	$(OBJS)\advdll_animatecmn.obj &
-	$(OBJS)\advdll_bmpcboxcmn.obj &
-	$(OBJS)\advdll_calctrlcmn.obj &
-	$(OBJS)\advdll_datavcmn.obj &
-	$(OBJS)\advdll_gridcmn.obj &
-	$(OBJS)\advdll_hyperlnkcmn.obj &
-	$(OBJS)\advdll_odcombocmn.obj &
-	$(OBJS)\advdll_richtooltipcmn.obj &
-	$(OBJS)\advdll_aboutdlgg.obj &
-	$(OBJS)\advdll_bannerwindow.obj &
-	$(OBJS)\advdll_bmpcboxg.obj &
-	$(OBJS)\advdll_calctrlg.obj &
-	$(OBJS)\advdll_commandlinkbuttong.obj &
-	$(OBJS)\advdll_datavgen.obj &
+	$(OBJS)\advdll_helpext.obj &
+	$(OBJS)\advdll_hyperlinkg.obj &
+	$(OBJS)\advdll_laywin.obj &
+	$(OBJS)\advdll_notifmsgg.obj &
+	$(OBJS)\advdll_odcombo.obj &
+	$(OBJS)\advdll_propdlg.obj &
+	$(OBJS)\advdll_richtooltipg.obj &
+	$(OBJS)\advdll_sashwin.obj &
+	$(OBJS)\advdll_splash.obj &
+	$(OBJS)\advdll_timectrlg.obj &
+	$(OBJS)\advdll_tipdlg.obj &
+	$(OBJS)\advdll_treelist.obj &
+	$(OBJS)\advdll_wizard.obj &
+	$(OBJS)\advdll_taskbarcmn.obj &
+	$(OBJS)\advdll_aboutdlg.obj &
+	$(OBJS)\advdll_notifmsg.obj &
+	$(OBJS)\advdll_richtooltip.obj &
+	$(OBJS)\advdll_sound.obj &
+	$(OBJS)\advdll_taskbar.obj &
+	$(OBJS)\advdll_joystick.obj &
+	$(OBJS)\advdll_animateg.obj &
+	$(OBJS)\advdll_bmpcbox.obj &
+	$(OBJS)\advdll_calctrl.obj &
+	$(OBJS)\advdll_commandlinkbutton.obj &
+	$(OBJS)\advdll_datecontrols.obj &
+	$(OBJS)\advdll_datectrl.obj &
+	$(OBJS)\advdll_datetimectrl.obj &
+	$(OBJS)\advdll_hyperlink.obj &
+	$(OBJS)\advdll_timectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
+	$(OBJS)\advdll_animatecmn.obj &
+	$(OBJS)\advdll_bmpcboxcmn.obj &
+	$(OBJS)\advdll_calctrlcmn.obj &
+	$(OBJS)\advdll_datavcmn.obj &
+	$(OBJS)\advdll_gridcmn.obj &
+	$(OBJS)\advdll_hyperlnkcmn.obj &
+	$(OBJS)\advdll_odcombocmn.obj &
+	$(OBJS)\advdll_richtooltipcmn.obj &
+	$(OBJS)\advdll_aboutdlgg.obj &
+	$(OBJS)\advdll_bannerwindow.obj &
+	$(OBJS)\advdll_bmpcboxg.obj &
+	$(OBJS)\advdll_calctrlg.obj &
+	$(OBJS)\advdll_commandlinkbuttong.obj &
+	$(OBJS)\advdll_datavgen.obj &
 	$(OBJS)\advdll_datectlg.obj &
 	$(OBJS)\advdll_editlbox.obj &
 	$(OBJS)\advdll_grid.obj &
 	$(OBJS)\advdll_gridctrl.obj &
 	$(OBJS)\advdll_grideditors.obj &
 	$(OBJS)\advdll_gridsel.obj &
-	$(OBJS)\advdll_helpext.obj &
-	$(OBJS)\advdll_hyperlinkg.obj &
-	$(OBJS)\advdll_laywin.obj &
-	$(OBJS)\advdll_notifmsgg.obj &
-	$(OBJS)\advdll_odcombo.obj &
-	$(OBJS)\advdll_propdlg.obj &
-	$(OBJS)\advdll_generic_richtooltip.obj &
-	$(OBJS)\advdll_sashwin.obj &
-	$(OBJS)\advdll_splash.obj &
-	$(OBJS)\advdll_generic_timectrl.obj &
-	$(OBJS)\advdll_tipdlg.obj &
-	$(OBJS)\advdll_treelist.obj &
-	$(OBJS)\advdll_wizard.obj &
-	$(OBJS)\advdll_taskbarcmn.obj &
-	$(OBJS)\advdll_aboutdlg.obj &
-	$(OBJS)\advdll_notifmsg.obj &
-	$(OBJS)\advdll_msw_richtooltip.obj &
-	$(OBJS)\advdll_sound.obj &
-	$(OBJS)\advdll_taskbar.obj &
-	$(OBJS)\advdll_joystick.obj &
-	$(OBJS)\advdll_animateg.obj
-!endif
-__advlib___depname =
+	$(OBJS)\advdll_helpext.obj &
+	$(OBJS)\advdll_hyperlinkg.obj &
+	$(OBJS)\advdll_laywin.obj &
+	$(OBJS)\advdll_notifmsgg.obj &
+	$(OBJS)\advdll_odcombo.obj &
+	$(OBJS)\advdll_propdlg.obj &
+	$(OBJS)\advdll_richtooltipg.obj &
+	$(OBJS)\advdll_sashwin.obj &
+	$(OBJS)\advdll_splash.obj &
+	$(OBJS)\advdll_timectrlg.obj &
+	$(OBJS)\advdll_tipdlg.obj &
+	$(OBJS)\advdll_treelist.obj &
+	$(OBJS)\advdll_wizard.obj &
+	$(OBJS)\advdll_taskbarcmn.obj &
+	$(OBJS)\advdll_aboutdlg.obj &
+	$(OBJS)\advdll_notifmsg.obj &
+	$(OBJS)\advdll_richtooltip.obj &
+	$(OBJS)\advdll_sound.obj &
+	$(OBJS)\advdll_taskbar.obj &
+	$(OBJS)\advdll_joystick.obj &
+	$(OBJS)\advdll_animateg.obj
+!endif
+__advlib___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 0
 !ifeq USE_GUI 1
@@ -2952,100 +2952,100 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\advlib_animatecmn.obj &
-	$(OBJS)\advlib_bmpcboxcmn.obj &
-	$(OBJS)\advlib_calctrlcmn.obj &
-	$(OBJS)\advlib_datavcmn.obj &
-	$(OBJS)\advlib_gridcmn.obj &
-	$(OBJS)\advlib_hyperlnkcmn.obj &
-	$(OBJS)\advlib_odcombocmn.obj &
-	$(OBJS)\advlib_richtooltipcmn.obj &
-	$(OBJS)\advlib_aboutdlgg.obj &
-	$(OBJS)\advlib_bannerwindow.obj &
-	$(OBJS)\advlib_bmpcboxg.obj &
-	$(OBJS)\advlib_calctrlg.obj &
-	$(OBJS)\advlib_commandlinkbuttong.obj &
-	$(OBJS)\advlib_datavgen.obj &
+	$(OBJS)\advlib_bmpcboxcmn.obj &
+	$(OBJS)\advlib_calctrlcmn.obj &
+	$(OBJS)\advlib_datavcmn.obj &
+	$(OBJS)\advlib_gridcmn.obj &
+	$(OBJS)\advlib_hyperlnkcmn.obj &
+	$(OBJS)\advlib_odcombocmn.obj &
+	$(OBJS)\advlib_richtooltipcmn.obj &
+	$(OBJS)\advlib_aboutdlgg.obj &
+	$(OBJS)\advlib_bannerwindow.obj &
+	$(OBJS)\advlib_bmpcboxg.obj &
+	$(OBJS)\advlib_calctrlg.obj &
+	$(OBJS)\advlib_commandlinkbuttong.obj &
+	$(OBJS)\advlib_datavgen.obj &
 	$(OBJS)\advlib_datectlg.obj &
 	$(OBJS)\advlib_editlbox.obj &
 	$(OBJS)\advlib_grid.obj &
 	$(OBJS)\advlib_gridctrl.obj &
 	$(OBJS)\advlib_grideditors.obj &
 	$(OBJS)\advlib_gridsel.obj &
-	$(OBJS)\advlib_helpext.obj &
-	$(OBJS)\advlib_hyperlinkg.obj &
-	$(OBJS)\advlib_laywin.obj &
-	$(OBJS)\advlib_notifmsgg.obj &
-	$(OBJS)\advlib_odcombo.obj &
-	$(OBJS)\advlib_propdlg.obj &
-	$(OBJS)\advlib_generic_richtooltip.obj &
-	$(OBJS)\advlib_sashwin.obj &
-	$(OBJS)\advlib_splash.obj &
-	$(OBJS)\advlib_generic_timectrl.obj &
-	$(OBJS)\advlib_tipdlg.obj &
-	$(OBJS)\advlib_treelist.obj &
-	$(OBJS)\advlib_wizard.obj &
-	$(OBJS)\advlib_taskbarcmn.obj &
-	$(OBJS)\advlib_aboutdlg.obj &
-	$(OBJS)\advlib_notifmsg.obj &
-	$(OBJS)\advlib_msw_richtooltip.obj &
-	$(OBJS)\advlib_sound.obj &
-	$(OBJS)\advlib_taskbar.obj &
-	$(OBJS)\advlib_joystick.obj &
-	$(OBJS)\advlib_animateg.obj &
-	$(OBJS)\advlib_bmpcbox.obj &
-	$(OBJS)\advlib_calctrl.obj &
-	$(OBJS)\advlib_commandlinkbutton.obj &
-	$(OBJS)\advlib_datecontrols.obj &
-	$(OBJS)\advlib_datectrl.obj &
-	$(OBJS)\advlib_datetimectrl.obj &
-	$(OBJS)\advlib_hyperlink.obj &
-	$(OBJS)\advlib_msw_timectrl.obj
-!endif
-!ifeq WXUNIV 1
-____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
-	$(OBJS)\advlib_animatecmn.obj &
-	$(OBJS)\advlib_bmpcboxcmn.obj &
-	$(OBJS)\advlib_calctrlcmn.obj &
-	$(OBJS)\advlib_datavcmn.obj &
-	$(OBJS)\advlib_gridcmn.obj &
-	$(OBJS)\advlib_hyperlnkcmn.obj &
-	$(OBJS)\advlib_odcombocmn.obj &
-	$(OBJS)\advlib_richtooltipcmn.obj &
-	$(OBJS)\advlib_aboutdlgg.obj &
-	$(OBJS)\advlib_bannerwindow.obj &
-	$(OBJS)\advlib_bmpcboxg.obj &
-	$(OBJS)\advlib_calctrlg.obj &
-	$(OBJS)\advlib_commandlinkbuttong.obj &
-	$(OBJS)\advlib_datavgen.obj &
+	$(OBJS)\advlib_helpext.obj &
+	$(OBJS)\advlib_hyperlinkg.obj &
+	$(OBJS)\advlib_laywin.obj &
+	$(OBJS)\advlib_notifmsgg.obj &
+	$(OBJS)\advlib_odcombo.obj &
+	$(OBJS)\advlib_propdlg.obj &
+	$(OBJS)\advlib_richtooltipg.obj &
+	$(OBJS)\advlib_sashwin.obj &
+	$(OBJS)\advlib_splash.obj &
+	$(OBJS)\advlib_timectrlg.obj &
+	$(OBJS)\advlib_tipdlg.obj &
+	$(OBJS)\advlib_treelist.obj &
+	$(OBJS)\advlib_wizard.obj &
+	$(OBJS)\advlib_taskbarcmn.obj &
+	$(OBJS)\advlib_aboutdlg.obj &
+	$(OBJS)\advlib_notifmsg.obj &
+	$(OBJS)\advlib_richtooltip.obj &
+	$(OBJS)\advlib_sound.obj &
+	$(OBJS)\advlib_taskbar.obj &
+	$(OBJS)\advlib_joystick.obj &
+	$(OBJS)\advlib_animateg.obj &
+	$(OBJS)\advlib_bmpcbox.obj &
+	$(OBJS)\advlib_calctrl.obj &
+	$(OBJS)\advlib_commandlinkbutton.obj &
+	$(OBJS)\advlib_datecontrols.obj &
+	$(OBJS)\advlib_datectrl.obj &
+	$(OBJS)\advlib_datetimectrl.obj &
+	$(OBJS)\advlib_hyperlink.obj &
+	$(OBJS)\advlib_timectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
+	$(OBJS)\advlib_animatecmn.obj &
+	$(OBJS)\advlib_bmpcboxcmn.obj &
+	$(OBJS)\advlib_calctrlcmn.obj &
+	$(OBJS)\advlib_datavcmn.obj &
+	$(OBJS)\advlib_gridcmn.obj &
+	$(OBJS)\advlib_hyperlnkcmn.obj &
+	$(OBJS)\advlib_odcombocmn.obj &
+	$(OBJS)\advlib_richtooltipcmn.obj &
+	$(OBJS)\advlib_aboutdlgg.obj &
+	$(OBJS)\advlib_bannerwindow.obj &
+	$(OBJS)\advlib_bmpcboxg.obj &
+	$(OBJS)\advlib_calctrlg.obj &
+	$(OBJS)\advlib_commandlinkbuttong.obj &
+	$(OBJS)\advlib_datavgen.obj &
 	$(OBJS)\advlib_datectlg.obj &
 	$(OBJS)\advlib_editlbox.obj &
 	$(OBJS)\advlib_grid.obj &
 	$(OBJS)\advlib_gridctrl.obj &
 	$(OBJS)\advlib_grideditors.obj &
 	$(OBJS)\advlib_gridsel.obj &
-	$(OBJS)\advlib_helpext.obj &
-	$(OBJS)\advlib_hyperlinkg.obj &
-	$(OBJS)\advlib_laywin.obj &
-	$(OBJS)\advlib_notifmsgg.obj &
-	$(OBJS)\advlib_odcombo.obj &
-	$(OBJS)\advlib_propdlg.obj &
-	$(OBJS)\advlib_generic_richtooltip.obj &
-	$(OBJS)\advlib_sashwin.obj &
-	$(OBJS)\advlib_splash.obj &
-	$(OBJS)\advlib_generic_timectrl.obj &
-	$(OBJS)\advlib_tipdlg.obj &
-	$(OBJS)\advlib_treelist.obj &
-	$(OBJS)\advlib_wizard.obj &
-	$(OBJS)\advlib_taskbarcmn.obj &
-	$(OBJS)\advlib_aboutdlg.obj &
-	$(OBJS)\advlib_notifmsg.obj &
-	$(OBJS)\advlib_msw_richtooltip.obj &
-	$(OBJS)\advlib_sound.obj &
-	$(OBJS)\advlib_taskbar.obj &
-	$(OBJS)\advlib_joystick.obj &
-	$(OBJS)\advlib_animateg.obj
-!endif
-____wxadv_namedll_DEP =
+	$(OBJS)\advlib_helpext.obj &
+	$(OBJS)\advlib_hyperlinkg.obj &
+	$(OBJS)\advlib_laywin.obj &
+	$(OBJS)\advlib_notifmsgg.obj &
+	$(OBJS)\advlib_odcombo.obj &
+	$(OBJS)\advlib_propdlg.obj &
+	$(OBJS)\advlib_richtooltipg.obj &
+	$(OBJS)\advlib_sashwin.obj &
+	$(OBJS)\advlib_splash.obj &
+	$(OBJS)\advlib_timectrlg.obj &
+	$(OBJS)\advlib_tipdlg.obj &
+	$(OBJS)\advlib_treelist.obj &
+	$(OBJS)\advlib_wizard.obj &
+	$(OBJS)\advlib_taskbarcmn.obj &
+	$(OBJS)\advlib_aboutdlg.obj &
+	$(OBJS)\advlib_notifmsg.obj &
+	$(OBJS)\advlib_richtooltip.obj &
+	$(OBJS)\advlib_sound.obj &
+	$(OBJS)\advlib_taskbar.obj &
+	$(OBJS)\advlib_joystick.obj &
+	$(OBJS)\advlib_animateg.obj
+!endif
+____wxadv_namedll_DEP =
 !ifeq SHARED 1
 ____wxadv_namedll_DEP = $(__advdll___depname)
 !endif
@@ -3911,7 +3911,7 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_tarstrm.obj &
 	$(OBJS)\monodll_textbuf.obj &
 	$(OBJS)\monodll_textfile.obj &
-	$(OBJS)\monodll_time.obj &
+	$(OBJS)\monodll_time.obj &
 	$(OBJS)\monodll_timercmn.obj &
 	$(OBJS)\monodll_timerimpl.obj &
 	$(OBJS)\monodll_tokenzr.obj &
@@ -4059,7 +4059,7 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_tarstrm.obj &
 	$(OBJS)\monolib_textbuf.obj &
 	$(OBJS)\monolib_textfile.obj &
-	$(OBJS)\monolib_time.obj &
+	$(OBJS)\monolib_time.obj &
 	$(OBJS)\monolib_timercmn.obj &
 	$(OBJS)\monolib_timerimpl.obj &
 	$(OBJS)\monolib_tokenzr.obj &
@@ -4205,7 +4205,7 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_tarstrm.obj &
 	$(OBJS)\basedll_textbuf.obj &
 	$(OBJS)\basedll_textfile.obj &
-	$(OBJS)\basedll_time.obj &
+	$(OBJS)\basedll_time.obj &
 	$(OBJS)\basedll_timercmn.obj &
 	$(OBJS)\basedll_timerimpl.obj &
 	$(OBJS)\basedll_tokenzr.obj &
@@ -4336,7 +4336,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_tarstrm.obj &
 	$(OBJS)\baselib_textbuf.obj &
 	$(OBJS)\baselib_textfile.obj &
-	$(OBJS)\baselib_time.obj &
+	$(OBJS)\baselib_time.obj &
 	$(OBJS)\baselib_timercmn.obj &
 	$(OBJS)\baselib_timerimpl.obj &
 	$(OBJS)\baselib_tokenzr.obj &
@@ -4736,19 +4736,19 @@ XRCDLL_OBJECTS =  &
 	$(OBJS)\xrcdll_xh_split.obj &
 	$(OBJS)\xrcdll_xh_srchctrl.obj &
 	$(OBJS)\xrcdll_xh_statbar.obj &
-	$(OBJS)\xrcdll_xh_stbmp.obj &
-	$(OBJS)\xrcdll_xh_stbox.obj &
-	$(OBJS)\xrcdll_xh_stlin.obj &
-	$(OBJS)\xrcdll_xh_sttxt.obj &
-	$(OBJS)\xrcdll_xh_text.obj &
-	$(OBJS)\xrcdll_xh_tglbtn.obj &
-	$(OBJS)\xrcdll_xh_timectrl.obj &
-	$(OBJS)\xrcdll_xh_toolb.obj &
-	$(OBJS)\xrcdll_xh_toolbk.obj &
-	$(OBJS)\xrcdll_xh_tree.obj &
-	$(OBJS)\xrcdll_xh_treebk.obj &
-	$(OBJS)\xrcdll_xh_unkwn.obj &
-	$(OBJS)\xrcdll_xh_wizrd.obj &
+	$(OBJS)\xrcdll_xh_stbmp.obj &
+	$(OBJS)\xrcdll_xh_stbox.obj &
+	$(OBJS)\xrcdll_xh_stlin.obj &
+	$(OBJS)\xrcdll_xh_sttxt.obj &
+	$(OBJS)\xrcdll_xh_text.obj &
+	$(OBJS)\xrcdll_xh_tglbtn.obj &
+	$(OBJS)\xrcdll_xh_timectrl.obj &
+	$(OBJS)\xrcdll_xh_toolb.obj &
+	$(OBJS)\xrcdll_xh_toolbk.obj &
+	$(OBJS)\xrcdll_xh_tree.obj &
+	$(OBJS)\xrcdll_xh_treebk.obj &
+	$(OBJS)\xrcdll_xh_unkwn.obj &
+	$(OBJS)\xrcdll_xh_wizrd.obj &
 	$(OBJS)\xrcdll_xmlres.obj &
 	$(OBJS)\xrcdll_xmladv.obj &
 	$(OBJS)\xrcdll_xmlrsall.obj
@@ -4812,19 +4812,19 @@ XRCLIB_OBJECTS =  &
 	$(OBJS)\xrclib_xh_split.obj &
 	$(OBJS)\xrclib_xh_srchctrl.obj &
 	$(OBJS)\xrclib_xh_statbar.obj &
-	$(OBJS)\xrclib_xh_stbmp.obj &
-	$(OBJS)\xrclib_xh_stbox.obj &
-	$(OBJS)\xrclib_xh_stlin.obj &
-	$(OBJS)\xrclib_xh_sttxt.obj &
-	$(OBJS)\xrclib_xh_text.obj &
-	$(OBJS)\xrclib_xh_tglbtn.obj &
-	$(OBJS)\xrclib_xh_timectrl.obj &
-	$(OBJS)\xrclib_xh_toolb.obj &
-	$(OBJS)\xrclib_xh_toolbk.obj &
-	$(OBJS)\xrclib_xh_tree.obj &
-	$(OBJS)\xrclib_xh_treebk.obj &
-	$(OBJS)\xrclib_xh_unkwn.obj &
-	$(OBJS)\xrclib_xh_wizrd.obj &
+	$(OBJS)\xrclib_xh_stbmp.obj &
+	$(OBJS)\xrclib_xh_stbox.obj &
+	$(OBJS)\xrclib_xh_stlin.obj &
+	$(OBJS)\xrclib_xh_sttxt.obj &
+	$(OBJS)\xrclib_xh_text.obj &
+	$(OBJS)\xrclib_xh_tglbtn.obj &
+	$(OBJS)\xrclib_xh_timectrl.obj &
+	$(OBJS)\xrclib_xh_toolb.obj &
+	$(OBJS)\xrclib_xh_toolbk.obj &
+	$(OBJS)\xrclib_xh_tree.obj &
+	$(OBJS)\xrclib_xh_treebk.obj &
+	$(OBJS)\xrclib_xh_unkwn.obj &
+	$(OBJS)\xrclib_xh_wizrd.obj &
 	$(OBJS)\xrclib_xmlres.obj &
 	$(OBJS)\xrclib_xmladv.obj &
 	$(OBJS)\xrclib_xmlrsall.obj
@@ -6689,9 +6689,9 @@ $(OBJS)\monodll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
 $(OBJS)\monodll_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
+$(OBJS)\monodll_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7178,27 +7178,27 @@ $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
 $(OBJS)\monodll_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
+$(OBJS)\monodll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_mediactrl_wmp10.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7457,21 +7457,21 @@ $(OBJS)\monodll_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\monodll_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
+$(OBJS)\monodll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7745,23 +7745,23 @@ $(OBJS)\monodll_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monodll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -8715,23 +8715,23 @@ $(OBJS)\monodll_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monodll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -8810,38 +8810,38 @@ $(OBJS)\monodll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_generic_richtooltip.obj :  .AUTODEPEND ..\..\src\generic\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monodll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -8860,23 +8860,23 @@ $(OBJS)\monodll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_msw_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monodll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -9094,9 +9094,9 @@ $(OBJS)\monolib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
 $(OBJS)\monolib_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
+$(OBJS)\monolib_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -9583,27 +9583,27 @@ $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
 $(OBJS)\monolib_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
+$(OBJS)\monolib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_mediactrl_wmp10.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -9862,21 +9862,21 @@ $(OBJS)\monolib_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\monolib_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
+$(OBJS)\monolib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -10150,23 +10150,23 @@ $(OBJS)\monolib_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monolib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -11120,23 +11120,23 @@ $(OBJS)\monolib_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monolib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -11215,38 +11215,38 @@ $(OBJS)\monolib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_generic_richtooltip.obj :  .AUTODEPEND ..\..\src\generic\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monolib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -11265,23 +11265,23 @@ $(OBJS)\monolib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_msw_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monolib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -11499,9 +11499,9 @@ $(OBJS)\basedll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
 $(OBJS)\basedll_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
-$(OBJS)\basedll_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
+$(OBJS)\basedll_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -11838,9 +11838,9 @@ $(OBJS)\baselib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
 $(OBJS)\baselib_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
-$(OBJS)\baselib_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
+$(OBJS)\baselib_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -12528,23 +12528,23 @@ $(OBJS)\coredll_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
+!ifeq USE_GUI 1
+$(OBJS)\coredll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
@@ -13936,23 +13936,23 @@ $(OBJS)\corelib_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
+!ifeq USE_GUI 1
+$(OBJS)\corelib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
@@ -14891,27 +14891,27 @@ $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
 $(OBJS)\advdll_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
+$(OBJS)\advdll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -14921,21 +14921,21 @@ $(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
 $(OBJS)\advdll_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
+$(OBJS)\advdll_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -14978,51 +14978,51 @@ $(OBJS)\advdll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
 $(OBJS)\advdll_notifmsgg.obj :  .AUTODEPEND ..\..\src\generic\notifmsgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_generic_richtooltip.obj :  .AUTODEPEND ..\..\src\generic\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
+$(OBJS)\advdll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_msw_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
+$(OBJS)\advdll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -15041,27 +15041,27 @@ $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
 $(OBJS)\advlib_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
+$(OBJS)\advlib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -15071,21 +15071,21 @@ $(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
 $(OBJS)\advlib_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
+$(OBJS)\advlib_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -15128,51 +15128,51 @@ $(OBJS)\advlib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
 $(OBJS)\advlib_notifmsgg.obj :  .AUTODEPEND ..\..\src\generic\notifmsgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_generic_richtooltip.obj :  .AUTODEPEND ..\..\src\generic\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
+$(OBJS)\advlib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_timectrlg.obj :  .AUTODEPEND ..\..\src\generic\timectrlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_msw_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
+$(OBJS)\advlib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -15611,21 +15611,21 @@ $(OBJS)\xrcdll_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\xrcdll_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
+$(OBJS)\xrcdll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -15809,21 +15809,21 @@ $(OBJS)\xrclib_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\xrclib_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
+$(OBJS)\xrclib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<