X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83c2f426de3b8bc942e74463d60aae3c44e748aa..91b34dd9e1b29ace037dddc60513fbe79560403f:/build/makefile.wat?ds=sidebyside

diff --git a/build/makefile.wat b/build/makefile.wat
index ecd1e73e0c..55ff3becca 100644
--- a/build/makefile.wat
+++ b/build/makefile.wat
@@ -43,6 +43,11 @@ VENDORTAG =
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+WXDEBUGFLAG = d
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif
 WXDLLFLAG =
@@ -57,22 +62,47 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
-__DEBUGFLAG =
+__DEBUGINFO =
 !ifeq BUILD debug
-__DEBUGFLAG = -d2
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d2
+!endif
 !endif
 !ifeq BUILD release
-__DEBUGFLAG = -d0
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d0
 !endif
-__DEBUGFLAG_7 =
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO = -d2
+!endif
+__DEBUGINFO_10 =
 !ifeq BUILD debug
-__DEBUGFLAG_7 = debug all
+!ifeq DEBUG_INFO default
+__DEBUGINFO_10 = debug all
+!endif
 !endif
 !ifeq BUILD release
-__DEBUGFLAG_7 = 
+!ifeq DEBUG_INFO default
+__DEBUGINFO_10 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_10 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_10 = debug all
 !endif
 __DEBUG_DEFINE_p =
 !ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
 __LIB_JPEG_p =
@@ -154,30 +184,26 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_helpchm.obj &
 	$(OBJS)\monolib_helpwin.obj &
 	$(OBJS)\monolib_icon.obj &
-	$(OBJS)\monolib_joystick.obj &
 	$(OBJS)\monolib_minifram.obj &
+	$(OBJS)\monolib_automtn.obj &
+	$(OBJS)\monolib_dataobj.obj &
+	$(OBJS)\monolib_dropsrc.obj &
+	$(OBJS)\monolib_droptgt.obj &
+	$(OBJS)\monolib_oleutils.obj &
+	$(OBJS)\monolib_uuid.obj &
 	$(OBJS)\monolib_palette.obj &
 	$(OBJS)\monolib_pen.obj &
 	$(OBJS)\monolib_popupwin.obj &
 	$(OBJS)\monolib_region.obj &
+	$(OBJS)\monolib_renderer.obj &
 	$(OBJS)\monolib_settings.obj &
-	$(OBJS)\monolib_taskbarcmn.obj &
-	$(OBJS)\monolib_taskbar.obj &
 	$(OBJS)\monolib_timer.obj &
 	$(OBJS)\monolib_tooltip.obj &
 	$(OBJS)\monolib_toplevel.obj &
 	$(OBJS)\monolib_utilsgui.obj &
-	$(OBJS)\monolib_wave.obj &
+	$(OBJS)\monolib_uxtheme.obj &
 	$(OBJS)\monolib_window.obj &
-	$(OBJS)\monolib_automtn.obj &
-	$(OBJS)\monolib_dataobj.obj &
-	$(OBJS)\monolib_dropsrc.obj &
-	$(OBJS)\monolib_droptgt.obj &
-	$(OBJS)\monolib_oleutils.obj &
-	$(OBJS)\monolib_uuid.obj &
 	$(OBJS)\monolib_statusbr.obj &
-	$(OBJS)\monolib_uxtheme.obj &
-	$(OBJS)\monolib_access.obj &
 	$(OBJS)\monolib_accel.obj &
 	$(OBJS)\monolib_bmpbuttn.obj &
 	$(OBJS)\monolib_button.obj &
@@ -205,13 +231,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_msgdlg.obj &
 	$(OBJS)\monolib_nativdlg.obj &
 	$(OBJS)\monolib_notebook.obj &
+	$(OBJS)\monolib_access.obj &
 	$(OBJS)\monolib_ownerdrw.obj &
 	$(OBJS)\monolib_penwin.obj &
 	$(OBJS)\monolib_printdlg.obj &
 	$(OBJS)\monolib_printwin.obj &
 	$(OBJS)\monolib_radiobox.obj &
 	$(OBJS)\monolib_radiobut.obj &
-	$(OBJS)\monolib_renderer.obj &
 	$(OBJS)\monolib_scrolbar.obj &
 	$(OBJS)\monolib_slider95.obj &
 	$(OBJS)\monolib_spinbutt.obj &
@@ -226,40 +252,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_textctrl.obj &
 	$(OBJS)\monolib_tglbtn.obj &
 	$(OBJS)\monolib_treectrl.obj &
-	$(OBJS)\monolib_busyinfo.obj &
-	$(OBJS)\monolib_calctrl.obj &
-	$(OBJS)\monolib_choicdgg.obj &
-	$(OBJS)\monolib_dcbuffer.obj &
-	$(OBJS)\monolib_dcpsg.obj &
-	$(OBJS)\monolib_dirctrlg.obj &
-	$(OBJS)\monolib_dragimgg.obj &
-	$(OBJS)\monolib_grid.obj &
-	$(OBJS)\monolib_gridctrl.obj &
-	$(OBJS)\monolib_gridsel.obj &
-	$(OBJS)\monolib_helpext.obj &
-	$(OBJS)\monolib_laywin.obj &
-	$(OBJS)\monolib_logg.obj &
-	$(OBJS)\monolib_numdlgg.obj &
-	$(OBJS)\monolib_panelg.obj &
-	$(OBJS)\monolib_progdlgg.obj &
-	$(OBJS)\monolib_renderg.obj &
-	$(OBJS)\monolib_sashwin.obj &
-	$(OBJS)\monolib_scrlwing.obj &
-	$(OBJS)\monolib_selstore.obj &
-	$(OBJS)\monolib_spinctlg.obj &
-	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_splitter.obj &
-	$(OBJS)\monolib_tbarsmpl.obj &
-	$(OBJS)\monolib_textdlgg.obj &
-	$(OBJS)\monolib_tipdlg.obj &
-	$(OBJS)\monolib_tipwin.obj &
-	$(OBJS)\monolib_treectlg.obj &
-	$(OBJS)\monolib_vlbox.obj &
-	$(OBJS)\monolib_vscroll.obj &
-	$(OBJS)\monolib_wizard.obj &
-	$(OBJS)\monolib_appcmn.obj &
-	$(OBJS)\monolib_fontmap.obj &
 	$(OBJS)\monolib_accesscmn.obj &
+	$(OBJS)\monolib_appcmn.obj &
 	$(OBJS)\monolib_artprov.obj &
 	$(OBJS)\monolib_artstd.obj &
 	$(OBJS)\monolib_bmpbase.obj &
@@ -272,7 +266,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_ctrlcmn.obj &
 	$(OBJS)\monolib_ctrlsub.obj &
 	$(OBJS)\monolib_datacmn.obj &
-	$(OBJS)\monolib_dbgrid.obj &
 	$(OBJS)\monolib_dcbase.obj &
 	$(OBJS)\monolib_dlgcmn.obj &
 	$(OBJS)\monolib_dndcmn.obj &
@@ -285,9 +278,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_fddlgcmn.obj &
 	$(OBJS)\monolib_fldlgcmn.obj &
 	$(OBJS)\monolib_fontcmn.obj &
+	$(OBJS)\monolib_fontmap.obj &
 	$(OBJS)\monolib_framecmn.obj &
-	$(OBJS)\monolib_timercmn.obj &
-	$(OBJS)\monolib_toplvcmn.obj &
 	$(OBJS)\monolib_gaugecmn.obj &
 	$(OBJS)\monolib_gdicmn.obj &
 	$(OBJS)\monolib_geometry.obj &
@@ -297,6 +289,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_imagall.obj &
 	$(OBJS)\monolib_imagbmp.obj &
 	$(OBJS)\monolib_image.obj &
+	$(OBJS)\monolib_imagfill.obj &
 	$(OBJS)\monolib_imaggif.obj &
 	$(OBJS)\monolib_imagiff.obj &
 	$(OBJS)\monolib_imagjpeg.obj &
@@ -305,7 +298,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_imagpnm.obj &
 	$(OBJS)\monolib_imagtiff.obj &
 	$(OBJS)\monolib_imagxpm.obj &
-	$(OBJS)\monolib_imagfill.obj &
 	$(OBJS)\monolib_layout.obj &
 	$(OBJS)\monolib_lboxcmn.obj &
 	$(OBJS)\monolib_matrix.obj &
@@ -323,12 +315,34 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_statbar.obj &
 	$(OBJS)\monolib_tbarbase.obj &
 	$(OBJS)\monolib_textcmn.obj &
+	$(OBJS)\monolib_timercmn.obj &
+	$(OBJS)\monolib_toplvcmn.obj &
 	$(OBJS)\monolib_treebase.obj &
 	$(OBJS)\monolib_valgen.obj &
 	$(OBJS)\monolib_validate.obj &
 	$(OBJS)\monolib_valtext.obj &
 	$(OBJS)\monolib_wincmn.obj &
-	$(OBJS)\monolib_xpmdecod.obj
+	$(OBJS)\monolib_xpmdecod.obj &
+	$(OBJS)\monolib_busyinfo.obj &
+	$(OBJS)\monolib_choicdgg.obj &
+	$(OBJS)\monolib_dcpsg.obj &
+	$(OBJS)\monolib_dirctrlg.obj &
+	$(OBJS)\monolib_dragimgg.obj &
+	$(OBJS)\monolib_logg.obj &
+	$(OBJS)\monolib_numdlgg.obj &
+	$(OBJS)\monolib_panelg.obj &
+	$(OBJS)\monolib_progdlgg.obj &
+	$(OBJS)\monolib_renderg.obj &
+	$(OBJS)\monolib_scrlwing.obj &
+	$(OBJS)\monolib_selstore.obj &
+	$(OBJS)\monolib_spinctlg.obj &
+	$(OBJS)\monolib_splitter.obj &
+	$(OBJS)\monolib_tbarsmpl.obj &
+	$(OBJS)\monolib_textdlgg.obj &
+	$(OBJS)\monolib_tipwin.obj &
+	$(OBJS)\monolib_treectlg.obj &
+	$(OBJS)\monolib_vlbox.obj &
+	$(OBJS)\monolib_vscroll.obj
 !endif
 !endif
 !ifeq USE_GUI 1
@@ -361,28 +375,38 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_helpchm.obj &
 	$(OBJS)\monolib_helpwin.obj &
 	$(OBJS)\monolib_icon.obj &
-	$(OBJS)\monolib_joystick.obj &
 	$(OBJS)\monolib_minifram.obj &
+	$(OBJS)\monolib_automtn.obj &
+	$(OBJS)\monolib_dataobj.obj &
+	$(OBJS)\monolib_dropsrc.obj &
+	$(OBJS)\monolib_droptgt.obj &
+	$(OBJS)\monolib_oleutils.obj &
+	$(OBJS)\monolib_uuid.obj &
 	$(OBJS)\monolib_palette.obj &
 	$(OBJS)\monolib_pen.obj &
 	$(OBJS)\monolib_popupwin.obj &
 	$(OBJS)\monolib_region.obj &
+	$(OBJS)\monolib_renderer.obj &
 	$(OBJS)\monolib_settings.obj &
-	$(OBJS)\monolib_taskbarcmn.obj &
-	$(OBJS)\monolib_taskbar.obj &
 	$(OBJS)\monolib_timer.obj &
 	$(OBJS)\monolib_tooltip.obj &
 	$(OBJS)\monolib_toplevel.obj &
 	$(OBJS)\monolib_utilsgui.obj &
-	$(OBJS)\monolib_wave.obj &
+	$(OBJS)\monolib_uxtheme.obj &
 	$(OBJS)\monolib_window.obj &
-	$(OBJS)\monolib_automtn.obj &
-	$(OBJS)\monolib_dataobj.obj &
-	$(OBJS)\monolib_dropsrc.obj &
-	$(OBJS)\monolib_droptgt.obj &
-	$(OBJS)\monolib_oleutils.obj &
-	$(OBJS)\monolib_uuid.obj &
 	$(OBJS)\monolib_textctrl.obj &
+	$(OBJS)\monolib_accel.obj &
+	$(OBJS)\monolib_colrdlgg.obj &
+	$(OBJS)\monolib_dirdlgg.obj &
+	$(OBJS)\monolib_fdrepdlg.obj &
+	$(OBJS)\monolib_filedlgg.obj &
+	$(OBJS)\monolib_fontdlgg.obj &
+	$(OBJS)\monolib_imaglist.obj &
+	$(OBJS)\monolib_listctrl.obj &
+	$(OBJS)\monolib_mdig.obj &
+	$(OBJS)\monolib_msgdlgg.obj &
+	$(OBJS)\monolib_prntdlgg.obj &
+	$(OBJS)\monolib_tabg.obj &
 	$(OBJS)\monolib_bmpbuttn.obj &
 	$(OBJS)\monolib_button.obj &
 	$(OBJS)\monolib_checkbox.obj &
@@ -391,9 +415,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_colschem.obj &
 	$(OBJS)\monolib_combobox.obj &
 	$(OBJS)\monolib_control.obj &
+	$(OBJS)\monolib_ctrlrend.obj &
 	$(OBJS)\monolib_dialog.obj &
 	$(OBJS)\monolib_framuniv.obj &
-	$(OBJS)\monolib_topluniv.obj &
 	$(OBJS)\monolib_gauge.obj &
 	$(OBJS)\monolib_inpcons.obj &
 	$(OBJS)\monolib_inphand.obj &
@@ -402,7 +426,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_notebook.obj &
 	$(OBJS)\monolib_radiobox.obj &
 	$(OBJS)\monolib_radiobut.obj &
-	$(OBJS)\monolib_renderer.obj &
 	$(OBJS)\monolib_scrarrow.obj &
 	$(OBJS)\monolib_scrolbar.obj &
 	$(OBJS)\monolib_scrthumb.obj &
@@ -413,58 +436,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_statline.obj &
 	$(OBJS)\monolib_stattext.obj &
 	$(OBJS)\monolib_statusbr.obj &
-	$(OBJS)\monolib_toolbar.obj &
 	$(OBJS)\monolib_theme.obj &
+	$(OBJS)\monolib_toolbar.obj &
+	$(OBJS)\monolib_topluniv.obj &
 	$(OBJS)\monolib_winuniv.obj &
-	$(OBJS)\monolib_mdig.obj &
-	$(OBJS)\monolib_imaglist.obj &
-	$(OBJS)\monolib_colrdlgg.obj &
-	$(OBJS)\monolib_listctrl.obj &
-	$(OBJS)\monolib_filedlgg.obj &
-	$(OBJS)\monolib_dirdlgg.obj &
-	$(OBJS)\monolib_prntdlgg.obj &
-	$(OBJS)\monolib_accel.obj &
-	$(OBJS)\monolib_msgdlgg.obj &
-	$(OBJS)\monolib_fdrepdlg.obj &
-	$(OBJS)\monolib_fontdlgg.obj &
-	$(OBJS)\monolib_tabg.obj &
 	$(OBJS)\monolib_gtk.obj &
-	$(OBJS)\monolib_win32.obj &
 	$(OBJS)\monolib_metal.obj &
-	$(OBJS)\monolib_busyinfo.obj &
-	$(OBJS)\monolib_calctrl.obj &
-	$(OBJS)\monolib_choicdgg.obj &
-	$(OBJS)\monolib_dcbuffer.obj &
-	$(OBJS)\monolib_dcpsg.obj &
-	$(OBJS)\monolib_dirctrlg.obj &
-	$(OBJS)\monolib_dragimgg.obj &
-	$(OBJS)\monolib_grid.obj &
-	$(OBJS)\monolib_gridctrl.obj &
-	$(OBJS)\monolib_gridsel.obj &
-	$(OBJS)\monolib_helpext.obj &
-	$(OBJS)\monolib_laywin.obj &
-	$(OBJS)\monolib_logg.obj &
-	$(OBJS)\monolib_numdlgg.obj &
-	$(OBJS)\monolib_panelg.obj &
-	$(OBJS)\monolib_progdlgg.obj &
-	$(OBJS)\monolib_renderg.obj &
-	$(OBJS)\monolib_sashwin.obj &
-	$(OBJS)\monolib_scrlwing.obj &
-	$(OBJS)\monolib_selstore.obj &
-	$(OBJS)\monolib_spinctlg.obj &
-	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_splitter.obj &
-	$(OBJS)\monolib_tbarsmpl.obj &
-	$(OBJS)\monolib_textdlgg.obj &
-	$(OBJS)\monolib_tipdlg.obj &
-	$(OBJS)\monolib_tipwin.obj &
-	$(OBJS)\monolib_treectlg.obj &
-	$(OBJS)\monolib_vlbox.obj &
-	$(OBJS)\monolib_vscroll.obj &
-	$(OBJS)\monolib_wizard.obj &
-	$(OBJS)\monolib_appcmn.obj &
-	$(OBJS)\monolib_fontmap.obj &
+	$(OBJS)\monolib_win32.obj &
 	$(OBJS)\monolib_accesscmn.obj &
+	$(OBJS)\monolib_appcmn.obj &
 	$(OBJS)\monolib_artprov.obj &
 	$(OBJS)\monolib_artstd.obj &
 	$(OBJS)\monolib_bmpbase.obj &
@@ -477,7 +457,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_ctrlcmn.obj &
 	$(OBJS)\monolib_ctrlsub.obj &
 	$(OBJS)\monolib_datacmn.obj &
-	$(OBJS)\monolib_dbgrid.obj &
 	$(OBJS)\monolib_dcbase.obj &
 	$(OBJS)\monolib_dlgcmn.obj &
 	$(OBJS)\monolib_dndcmn.obj &
@@ -490,9 +469,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_fddlgcmn.obj &
 	$(OBJS)\monolib_fldlgcmn.obj &
 	$(OBJS)\monolib_fontcmn.obj &
+	$(OBJS)\monolib_fontmap.obj &
 	$(OBJS)\monolib_framecmn.obj &
-	$(OBJS)\monolib_timercmn.obj &
-	$(OBJS)\monolib_toplvcmn.obj &
 	$(OBJS)\monolib_gaugecmn.obj &
 	$(OBJS)\monolib_gdicmn.obj &
 	$(OBJS)\monolib_geometry.obj &
@@ -502,6 +480,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_imagall.obj &
 	$(OBJS)\monolib_imagbmp.obj &
 	$(OBJS)\monolib_image.obj &
+	$(OBJS)\monolib_imagfill.obj &
 	$(OBJS)\monolib_imaggif.obj &
 	$(OBJS)\monolib_imagiff.obj &
 	$(OBJS)\monolib_imagjpeg.obj &
@@ -510,7 +489,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_imagpnm.obj &
 	$(OBJS)\monolib_imagtiff.obj &
 	$(OBJS)\monolib_imagxpm.obj &
-	$(OBJS)\monolib_imagfill.obj &
 	$(OBJS)\monolib_layout.obj &
 	$(OBJS)\monolib_lboxcmn.obj &
 	$(OBJS)\monolib_matrix.obj &
@@ -528,12 +506,34 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_statbar.obj &
 	$(OBJS)\monolib_tbarbase.obj &
 	$(OBJS)\monolib_textcmn.obj &
+	$(OBJS)\monolib_timercmn.obj &
+	$(OBJS)\monolib_toplvcmn.obj &
 	$(OBJS)\monolib_treebase.obj &
 	$(OBJS)\monolib_valgen.obj &
 	$(OBJS)\monolib_validate.obj &
 	$(OBJS)\monolib_valtext.obj &
 	$(OBJS)\monolib_wincmn.obj &
-	$(OBJS)\monolib_xpmdecod.obj
+	$(OBJS)\monolib_xpmdecod.obj &
+	$(OBJS)\monolib_busyinfo.obj &
+	$(OBJS)\monolib_choicdgg.obj &
+	$(OBJS)\monolib_dcpsg.obj &
+	$(OBJS)\monolib_dirctrlg.obj &
+	$(OBJS)\monolib_dragimgg.obj &
+	$(OBJS)\monolib_logg.obj &
+	$(OBJS)\monolib_numdlgg.obj &
+	$(OBJS)\monolib_panelg.obj &
+	$(OBJS)\monolib_progdlgg.obj &
+	$(OBJS)\monolib_renderg.obj &
+	$(OBJS)\monolib_scrlwing.obj &
+	$(OBJS)\monolib_selstore.obj &
+	$(OBJS)\monolib_spinctlg.obj &
+	$(OBJS)\monolib_splitter.obj &
+	$(OBJS)\monolib_tbarsmpl.obj &
+	$(OBJS)\monolib_textdlgg.obj &
+	$(OBJS)\monolib_tipwin.obj &
+	$(OBJS)\monolib_treectlg.obj &
+	$(OBJS)\monolib_vlbox.obj &
+	$(OBJS)\monolib_vscroll.obj
 !endif
 !endif
 ____CORE_SRC_FILENAMES_2_OBJECTS =
@@ -567,30 +567,26 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_helpchm.obj &
 	$(OBJS)\coredll_helpwin.obj &
 	$(OBJS)\coredll_icon.obj &
-	$(OBJS)\coredll_joystick.obj &
 	$(OBJS)\coredll_minifram.obj &
+	$(OBJS)\coredll_automtn.obj &
+	$(OBJS)\coredll_dataobj.obj &
+	$(OBJS)\coredll_dropsrc.obj &
+	$(OBJS)\coredll_droptgt.obj &
+	$(OBJS)\coredll_oleutils.obj &
+	$(OBJS)\coredll_uuid.obj &
 	$(OBJS)\coredll_palette.obj &
 	$(OBJS)\coredll_pen.obj &
 	$(OBJS)\coredll_popupwin.obj &
 	$(OBJS)\coredll_region.obj &
+	$(OBJS)\coredll_renderer.obj &
 	$(OBJS)\coredll_settings.obj &
-	$(OBJS)\coredll_taskbarcmn.obj &
-	$(OBJS)\coredll_taskbar.obj &
 	$(OBJS)\coredll_timer.obj &
 	$(OBJS)\coredll_tooltip.obj &
 	$(OBJS)\coredll_toplevel.obj &
 	$(OBJS)\coredll_utilsgui.obj &
-	$(OBJS)\coredll_wave.obj &
+	$(OBJS)\coredll_uxtheme.obj &
 	$(OBJS)\coredll_window.obj &
-	$(OBJS)\coredll_automtn.obj &
-	$(OBJS)\coredll_dataobj.obj &
-	$(OBJS)\coredll_dropsrc.obj &
-	$(OBJS)\coredll_droptgt.obj &
-	$(OBJS)\coredll_oleutils.obj &
-	$(OBJS)\coredll_uuid.obj &
 	$(OBJS)\coredll_statusbr.obj &
-	$(OBJS)\coredll_uxtheme.obj &
-	$(OBJS)\coredll_access.obj &
 	$(OBJS)\coredll_accel.obj &
 	$(OBJS)\coredll_bmpbuttn.obj &
 	$(OBJS)\coredll_button.obj &
@@ -618,13 +614,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_msgdlg.obj &
 	$(OBJS)\coredll_nativdlg.obj &
 	$(OBJS)\coredll_notebook.obj &
+	$(OBJS)\coredll_access.obj &
 	$(OBJS)\coredll_ownerdrw.obj &
 	$(OBJS)\coredll_penwin.obj &
 	$(OBJS)\coredll_printdlg.obj &
 	$(OBJS)\coredll_printwin.obj &
 	$(OBJS)\coredll_radiobox.obj &
 	$(OBJS)\coredll_radiobut.obj &
-	$(OBJS)\coredll_renderer.obj &
 	$(OBJS)\coredll_scrolbar.obj &
 	$(OBJS)\coredll_slider95.obj &
 	$(OBJS)\coredll_spinbutt.obj &
@@ -639,40 +635,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_textctrl.obj &
 	$(OBJS)\coredll_tglbtn.obj &
 	$(OBJS)\coredll_treectrl.obj &
-	$(OBJS)\coredll_busyinfo.obj &
-	$(OBJS)\coredll_calctrl.obj &
-	$(OBJS)\coredll_choicdgg.obj &
-	$(OBJS)\coredll_dcbuffer.obj &
-	$(OBJS)\coredll_dcpsg.obj &
-	$(OBJS)\coredll_dirctrlg.obj &
-	$(OBJS)\coredll_dragimgg.obj &
-	$(OBJS)\coredll_grid.obj &
-	$(OBJS)\coredll_gridctrl.obj &
-	$(OBJS)\coredll_gridsel.obj &
-	$(OBJS)\coredll_helpext.obj &
-	$(OBJS)\coredll_laywin.obj &
-	$(OBJS)\coredll_logg.obj &
-	$(OBJS)\coredll_numdlgg.obj &
-	$(OBJS)\coredll_panelg.obj &
-	$(OBJS)\coredll_progdlgg.obj &
-	$(OBJS)\coredll_renderg.obj &
-	$(OBJS)\coredll_sashwin.obj &
-	$(OBJS)\coredll_scrlwing.obj &
-	$(OBJS)\coredll_selstore.obj &
-	$(OBJS)\coredll_spinctlg.obj &
-	$(OBJS)\coredll_splash.obj &
-	$(OBJS)\coredll_splitter.obj &
-	$(OBJS)\coredll_tbarsmpl.obj &
-	$(OBJS)\coredll_textdlgg.obj &
-	$(OBJS)\coredll_tipdlg.obj &
-	$(OBJS)\coredll_tipwin.obj &
-	$(OBJS)\coredll_treectlg.obj &
-	$(OBJS)\coredll_vlbox.obj &
-	$(OBJS)\coredll_vscroll.obj &
-	$(OBJS)\coredll_wizard.obj &
-	$(OBJS)\coredll_appcmn.obj &
-	$(OBJS)\coredll_fontmap.obj &
 	$(OBJS)\coredll_accesscmn.obj &
+	$(OBJS)\coredll_appcmn.obj &
 	$(OBJS)\coredll_artprov.obj &
 	$(OBJS)\coredll_artstd.obj &
 	$(OBJS)\coredll_bmpbase.obj &
@@ -685,7 +649,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_ctrlcmn.obj &
 	$(OBJS)\coredll_ctrlsub.obj &
 	$(OBJS)\coredll_datacmn.obj &
-	$(OBJS)\coredll_dbgrid.obj &
 	$(OBJS)\coredll_dcbase.obj &
 	$(OBJS)\coredll_dlgcmn.obj &
 	$(OBJS)\coredll_dndcmn.obj &
@@ -698,9 +661,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_fddlgcmn.obj &
 	$(OBJS)\coredll_fldlgcmn.obj &
 	$(OBJS)\coredll_fontcmn.obj &
+	$(OBJS)\coredll_fontmap.obj &
 	$(OBJS)\coredll_framecmn.obj &
-	$(OBJS)\coredll_timercmn.obj &
-	$(OBJS)\coredll_toplvcmn.obj &
 	$(OBJS)\coredll_gaugecmn.obj &
 	$(OBJS)\coredll_gdicmn.obj &
 	$(OBJS)\coredll_geometry.obj &
@@ -710,6 +672,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_imagall.obj &
 	$(OBJS)\coredll_imagbmp.obj &
 	$(OBJS)\coredll_image.obj &
+	$(OBJS)\coredll_imagfill.obj &
 	$(OBJS)\coredll_imaggif.obj &
 	$(OBJS)\coredll_imagiff.obj &
 	$(OBJS)\coredll_imagjpeg.obj &
@@ -718,7 +681,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_imagpnm.obj &
 	$(OBJS)\coredll_imagtiff.obj &
 	$(OBJS)\coredll_imagxpm.obj &
-	$(OBJS)\coredll_imagfill.obj &
 	$(OBJS)\coredll_layout.obj &
 	$(OBJS)\coredll_lboxcmn.obj &
 	$(OBJS)\coredll_matrix.obj &
@@ -736,18 +698,40 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_statbar.obj &
 	$(OBJS)\coredll_tbarbase.obj &
 	$(OBJS)\coredll_textcmn.obj &
+	$(OBJS)\coredll_timercmn.obj &
+	$(OBJS)\coredll_toplvcmn.obj &
 	$(OBJS)\coredll_treebase.obj &
 	$(OBJS)\coredll_valgen.obj &
 	$(OBJS)\coredll_validate.obj &
 	$(OBJS)\coredll_valtext.obj &
 	$(OBJS)\coredll_wincmn.obj &
-	$(OBJS)\coredll_xpmdecod.obj
-!endif
-!endif
-!ifeq USE_GUI 1
-!ifeq WXUNIV 1
-____CORE_SRC_FILENAMES_2_OBJECTS =  &
-	$(OBJS)\coredll_app.obj &
+	$(OBJS)\coredll_xpmdecod.obj &
+	$(OBJS)\coredll_busyinfo.obj &
+	$(OBJS)\coredll_choicdgg.obj &
+	$(OBJS)\coredll_dcpsg.obj &
+	$(OBJS)\coredll_dirctrlg.obj &
+	$(OBJS)\coredll_dragimgg.obj &
+	$(OBJS)\coredll_logg.obj &
+	$(OBJS)\coredll_numdlgg.obj &
+	$(OBJS)\coredll_panelg.obj &
+	$(OBJS)\coredll_progdlgg.obj &
+	$(OBJS)\coredll_renderg.obj &
+	$(OBJS)\coredll_scrlwing.obj &
+	$(OBJS)\coredll_selstore.obj &
+	$(OBJS)\coredll_spinctlg.obj &
+	$(OBJS)\coredll_splitter.obj &
+	$(OBJS)\coredll_tbarsmpl.obj &
+	$(OBJS)\coredll_textdlgg.obj &
+	$(OBJS)\coredll_tipwin.obj &
+	$(OBJS)\coredll_treectlg.obj &
+	$(OBJS)\coredll_vlbox.obj &
+	$(OBJS)\coredll_vscroll.obj
+!endif
+!endif
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+____CORE_SRC_FILENAMES_2_OBJECTS =  &
+	$(OBJS)\coredll_app.obj &
 	$(OBJS)\coredll_bitmap.obj &
 	$(OBJS)\coredll_brush.obj &
 	$(OBJS)\coredll_caret.obj &
@@ -774,28 +758,38 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_helpchm.obj &
 	$(OBJS)\coredll_helpwin.obj &
 	$(OBJS)\coredll_icon.obj &
-	$(OBJS)\coredll_joystick.obj &
 	$(OBJS)\coredll_minifram.obj &
+	$(OBJS)\coredll_automtn.obj &
+	$(OBJS)\coredll_dataobj.obj &
+	$(OBJS)\coredll_dropsrc.obj &
+	$(OBJS)\coredll_droptgt.obj &
+	$(OBJS)\coredll_oleutils.obj &
+	$(OBJS)\coredll_uuid.obj &
 	$(OBJS)\coredll_palette.obj &
 	$(OBJS)\coredll_pen.obj &
 	$(OBJS)\coredll_popupwin.obj &
 	$(OBJS)\coredll_region.obj &
+	$(OBJS)\coredll_renderer.obj &
 	$(OBJS)\coredll_settings.obj &
-	$(OBJS)\coredll_taskbarcmn.obj &
-	$(OBJS)\coredll_taskbar.obj &
 	$(OBJS)\coredll_timer.obj &
 	$(OBJS)\coredll_tooltip.obj &
 	$(OBJS)\coredll_toplevel.obj &
 	$(OBJS)\coredll_utilsgui.obj &
-	$(OBJS)\coredll_wave.obj &
+	$(OBJS)\coredll_uxtheme.obj &
 	$(OBJS)\coredll_window.obj &
-	$(OBJS)\coredll_automtn.obj &
-	$(OBJS)\coredll_dataobj.obj &
-	$(OBJS)\coredll_dropsrc.obj &
-	$(OBJS)\coredll_droptgt.obj &
-	$(OBJS)\coredll_oleutils.obj &
-	$(OBJS)\coredll_uuid.obj &
 	$(OBJS)\coredll_textctrl.obj &
+	$(OBJS)\coredll_accel.obj &
+	$(OBJS)\coredll_colrdlgg.obj &
+	$(OBJS)\coredll_dirdlgg.obj &
+	$(OBJS)\coredll_fdrepdlg.obj &
+	$(OBJS)\coredll_filedlgg.obj &
+	$(OBJS)\coredll_fontdlgg.obj &
+	$(OBJS)\coredll_imaglist.obj &
+	$(OBJS)\coredll_listctrl.obj &
+	$(OBJS)\coredll_mdig.obj &
+	$(OBJS)\coredll_msgdlgg.obj &
+	$(OBJS)\coredll_prntdlgg.obj &
+	$(OBJS)\coredll_tabg.obj &
 	$(OBJS)\coredll_bmpbuttn.obj &
 	$(OBJS)\coredll_button.obj &
 	$(OBJS)\coredll_checkbox.obj &
@@ -804,9 +798,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_colschem.obj &
 	$(OBJS)\coredll_combobox.obj &
 	$(OBJS)\coredll_control.obj &
+	$(OBJS)\coredll_ctrlrend.obj &
 	$(OBJS)\coredll_dialog.obj &
 	$(OBJS)\coredll_framuniv.obj &
-	$(OBJS)\coredll_topluniv.obj &
 	$(OBJS)\coredll_gauge.obj &
 	$(OBJS)\coredll_inpcons.obj &
 	$(OBJS)\coredll_inphand.obj &
@@ -815,7 +809,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_notebook.obj &
 	$(OBJS)\coredll_radiobox.obj &
 	$(OBJS)\coredll_radiobut.obj &
-	$(OBJS)\coredll_renderer.obj &
 	$(OBJS)\coredll_scrarrow.obj &
 	$(OBJS)\coredll_scrolbar.obj &
 	$(OBJS)\coredll_scrthumb.obj &
@@ -826,58 +819,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_statline.obj &
 	$(OBJS)\coredll_stattext.obj &
 	$(OBJS)\coredll_statusbr.obj &
-	$(OBJS)\coredll_toolbar.obj &
 	$(OBJS)\coredll_theme.obj &
+	$(OBJS)\coredll_toolbar.obj &
+	$(OBJS)\coredll_topluniv.obj &
 	$(OBJS)\coredll_winuniv.obj &
-	$(OBJS)\coredll_mdig.obj &
-	$(OBJS)\coredll_imaglist.obj &
-	$(OBJS)\coredll_colrdlgg.obj &
-	$(OBJS)\coredll_listctrl.obj &
-	$(OBJS)\coredll_filedlgg.obj &
-	$(OBJS)\coredll_dirdlgg.obj &
-	$(OBJS)\coredll_prntdlgg.obj &
-	$(OBJS)\coredll_accel.obj &
-	$(OBJS)\coredll_msgdlgg.obj &
-	$(OBJS)\coredll_fdrepdlg.obj &
-	$(OBJS)\coredll_fontdlgg.obj &
-	$(OBJS)\coredll_tabg.obj &
 	$(OBJS)\coredll_gtk.obj &
-	$(OBJS)\coredll_win32.obj &
 	$(OBJS)\coredll_metal.obj &
-	$(OBJS)\coredll_busyinfo.obj &
-	$(OBJS)\coredll_calctrl.obj &
-	$(OBJS)\coredll_choicdgg.obj &
-	$(OBJS)\coredll_dcbuffer.obj &
-	$(OBJS)\coredll_dcpsg.obj &
-	$(OBJS)\coredll_dirctrlg.obj &
-	$(OBJS)\coredll_dragimgg.obj &
-	$(OBJS)\coredll_grid.obj &
-	$(OBJS)\coredll_gridctrl.obj &
-	$(OBJS)\coredll_gridsel.obj &
-	$(OBJS)\coredll_helpext.obj &
-	$(OBJS)\coredll_laywin.obj &
-	$(OBJS)\coredll_logg.obj &
-	$(OBJS)\coredll_numdlgg.obj &
-	$(OBJS)\coredll_panelg.obj &
-	$(OBJS)\coredll_progdlgg.obj &
-	$(OBJS)\coredll_renderg.obj &
-	$(OBJS)\coredll_sashwin.obj &
-	$(OBJS)\coredll_scrlwing.obj &
-	$(OBJS)\coredll_selstore.obj &
-	$(OBJS)\coredll_spinctlg.obj &
-	$(OBJS)\coredll_splash.obj &
-	$(OBJS)\coredll_splitter.obj &
-	$(OBJS)\coredll_tbarsmpl.obj &
-	$(OBJS)\coredll_textdlgg.obj &
-	$(OBJS)\coredll_tipdlg.obj &
-	$(OBJS)\coredll_tipwin.obj &
-	$(OBJS)\coredll_treectlg.obj &
-	$(OBJS)\coredll_vlbox.obj &
-	$(OBJS)\coredll_vscroll.obj &
-	$(OBJS)\coredll_wizard.obj &
-	$(OBJS)\coredll_appcmn.obj &
-	$(OBJS)\coredll_fontmap.obj &
+	$(OBJS)\coredll_win32.obj &
 	$(OBJS)\coredll_accesscmn.obj &
+	$(OBJS)\coredll_appcmn.obj &
 	$(OBJS)\coredll_artprov.obj &
 	$(OBJS)\coredll_artstd.obj &
 	$(OBJS)\coredll_bmpbase.obj &
@@ -890,7 +840,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_ctrlcmn.obj &
 	$(OBJS)\coredll_ctrlsub.obj &
 	$(OBJS)\coredll_datacmn.obj &
-	$(OBJS)\coredll_dbgrid.obj &
 	$(OBJS)\coredll_dcbase.obj &
 	$(OBJS)\coredll_dlgcmn.obj &
 	$(OBJS)\coredll_dndcmn.obj &
@@ -903,9 +852,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_fddlgcmn.obj &
 	$(OBJS)\coredll_fldlgcmn.obj &
 	$(OBJS)\coredll_fontcmn.obj &
+	$(OBJS)\coredll_fontmap.obj &
 	$(OBJS)\coredll_framecmn.obj &
-	$(OBJS)\coredll_timercmn.obj &
-	$(OBJS)\coredll_toplvcmn.obj &
 	$(OBJS)\coredll_gaugecmn.obj &
 	$(OBJS)\coredll_gdicmn.obj &
 	$(OBJS)\coredll_geometry.obj &
@@ -915,6 +863,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_imagall.obj &
 	$(OBJS)\coredll_imagbmp.obj &
 	$(OBJS)\coredll_image.obj &
+	$(OBJS)\coredll_imagfill.obj &
 	$(OBJS)\coredll_imaggif.obj &
 	$(OBJS)\coredll_imagiff.obj &
 	$(OBJS)\coredll_imagjpeg.obj &
@@ -923,7 +872,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_imagpnm.obj &
 	$(OBJS)\coredll_imagtiff.obj &
 	$(OBJS)\coredll_imagxpm.obj &
-	$(OBJS)\coredll_imagfill.obj &
 	$(OBJS)\coredll_layout.obj &
 	$(OBJS)\coredll_lboxcmn.obj &
 	$(OBJS)\coredll_matrix.obj &
@@ -941,12 +889,34 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_statbar.obj &
 	$(OBJS)\coredll_tbarbase.obj &
 	$(OBJS)\coredll_textcmn.obj &
+	$(OBJS)\coredll_timercmn.obj &
+	$(OBJS)\coredll_toplvcmn.obj &
 	$(OBJS)\coredll_treebase.obj &
 	$(OBJS)\coredll_valgen.obj &
 	$(OBJS)\coredll_validate.obj &
 	$(OBJS)\coredll_valtext.obj &
 	$(OBJS)\coredll_wincmn.obj &
-	$(OBJS)\coredll_xpmdecod.obj
+	$(OBJS)\coredll_xpmdecod.obj &
+	$(OBJS)\coredll_busyinfo.obj &
+	$(OBJS)\coredll_choicdgg.obj &
+	$(OBJS)\coredll_dcpsg.obj &
+	$(OBJS)\coredll_dirctrlg.obj &
+	$(OBJS)\coredll_dragimgg.obj &
+	$(OBJS)\coredll_logg.obj &
+	$(OBJS)\coredll_numdlgg.obj &
+	$(OBJS)\coredll_panelg.obj &
+	$(OBJS)\coredll_progdlgg.obj &
+	$(OBJS)\coredll_renderg.obj &
+	$(OBJS)\coredll_scrlwing.obj &
+	$(OBJS)\coredll_selstore.obj &
+	$(OBJS)\coredll_spinctlg.obj &
+	$(OBJS)\coredll_splitter.obj &
+	$(OBJS)\coredll_tbarsmpl.obj &
+	$(OBJS)\coredll_textdlgg.obj &
+	$(OBJS)\coredll_tipwin.obj &
+	$(OBJS)\coredll_treectlg.obj &
+	$(OBJS)\coredll_vlbox.obj &
+	$(OBJS)\coredll_vscroll.obj
 !endif
 !endif
 ____CORE_SRC_FILENAMES_3_OBJECTS =
@@ -980,30 +950,26 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_helpchm.obj &
 	$(OBJS)\corelib_helpwin.obj &
 	$(OBJS)\corelib_icon.obj &
-	$(OBJS)\corelib_joystick.obj &
 	$(OBJS)\corelib_minifram.obj &
+	$(OBJS)\corelib_automtn.obj &
+	$(OBJS)\corelib_dataobj.obj &
+	$(OBJS)\corelib_dropsrc.obj &
+	$(OBJS)\corelib_droptgt.obj &
+	$(OBJS)\corelib_oleutils.obj &
+	$(OBJS)\corelib_uuid.obj &
 	$(OBJS)\corelib_palette.obj &
 	$(OBJS)\corelib_pen.obj &
 	$(OBJS)\corelib_popupwin.obj &
 	$(OBJS)\corelib_region.obj &
+	$(OBJS)\corelib_renderer.obj &
 	$(OBJS)\corelib_settings.obj &
-	$(OBJS)\corelib_taskbarcmn.obj &
-	$(OBJS)\corelib_taskbar.obj &
 	$(OBJS)\corelib_timer.obj &
 	$(OBJS)\corelib_tooltip.obj &
 	$(OBJS)\corelib_toplevel.obj &
 	$(OBJS)\corelib_utilsgui.obj &
-	$(OBJS)\corelib_wave.obj &
+	$(OBJS)\corelib_uxtheme.obj &
 	$(OBJS)\corelib_window.obj &
-	$(OBJS)\corelib_automtn.obj &
-	$(OBJS)\corelib_dataobj.obj &
-	$(OBJS)\corelib_dropsrc.obj &
-	$(OBJS)\corelib_droptgt.obj &
-	$(OBJS)\corelib_oleutils.obj &
-	$(OBJS)\corelib_uuid.obj &
 	$(OBJS)\corelib_statusbr.obj &
-	$(OBJS)\corelib_uxtheme.obj &
-	$(OBJS)\corelib_access.obj &
 	$(OBJS)\corelib_accel.obj &
 	$(OBJS)\corelib_bmpbuttn.obj &
 	$(OBJS)\corelib_button.obj &
@@ -1031,13 +997,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_msgdlg.obj &
 	$(OBJS)\corelib_nativdlg.obj &
 	$(OBJS)\corelib_notebook.obj &
+	$(OBJS)\corelib_access.obj &
 	$(OBJS)\corelib_ownerdrw.obj &
 	$(OBJS)\corelib_penwin.obj &
 	$(OBJS)\corelib_printdlg.obj &
 	$(OBJS)\corelib_printwin.obj &
 	$(OBJS)\corelib_radiobox.obj &
 	$(OBJS)\corelib_radiobut.obj &
-	$(OBJS)\corelib_renderer.obj &
 	$(OBJS)\corelib_scrolbar.obj &
 	$(OBJS)\corelib_slider95.obj &
 	$(OBJS)\corelib_spinbutt.obj &
@@ -1052,40 +1018,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_textctrl.obj &
 	$(OBJS)\corelib_tglbtn.obj &
 	$(OBJS)\corelib_treectrl.obj &
-	$(OBJS)\corelib_busyinfo.obj &
-	$(OBJS)\corelib_calctrl.obj &
-	$(OBJS)\corelib_choicdgg.obj &
-	$(OBJS)\corelib_dcbuffer.obj &
-	$(OBJS)\corelib_dcpsg.obj &
-	$(OBJS)\corelib_dirctrlg.obj &
-	$(OBJS)\corelib_dragimgg.obj &
-	$(OBJS)\corelib_grid.obj &
-	$(OBJS)\corelib_gridctrl.obj &
-	$(OBJS)\corelib_gridsel.obj &
-	$(OBJS)\corelib_helpext.obj &
-	$(OBJS)\corelib_laywin.obj &
-	$(OBJS)\corelib_logg.obj &
-	$(OBJS)\corelib_numdlgg.obj &
-	$(OBJS)\corelib_panelg.obj &
-	$(OBJS)\corelib_progdlgg.obj &
-	$(OBJS)\corelib_renderg.obj &
-	$(OBJS)\corelib_sashwin.obj &
-	$(OBJS)\corelib_scrlwing.obj &
-	$(OBJS)\corelib_selstore.obj &
-	$(OBJS)\corelib_spinctlg.obj &
-	$(OBJS)\corelib_splash.obj &
-	$(OBJS)\corelib_splitter.obj &
-	$(OBJS)\corelib_tbarsmpl.obj &
-	$(OBJS)\corelib_textdlgg.obj &
-	$(OBJS)\corelib_tipdlg.obj &
-	$(OBJS)\corelib_tipwin.obj &
-	$(OBJS)\corelib_treectlg.obj &
-	$(OBJS)\corelib_vlbox.obj &
-	$(OBJS)\corelib_vscroll.obj &
-	$(OBJS)\corelib_wizard.obj &
-	$(OBJS)\corelib_appcmn.obj &
-	$(OBJS)\corelib_fontmap.obj &
 	$(OBJS)\corelib_accesscmn.obj &
+	$(OBJS)\corelib_appcmn.obj &
 	$(OBJS)\corelib_artprov.obj &
 	$(OBJS)\corelib_artstd.obj &
 	$(OBJS)\corelib_bmpbase.obj &
@@ -1098,7 +1032,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_ctrlcmn.obj &
 	$(OBJS)\corelib_ctrlsub.obj &
 	$(OBJS)\corelib_datacmn.obj &
-	$(OBJS)\corelib_dbgrid.obj &
 	$(OBJS)\corelib_dcbase.obj &
 	$(OBJS)\corelib_dlgcmn.obj &
 	$(OBJS)\corelib_dndcmn.obj &
@@ -1111,9 +1044,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_fddlgcmn.obj &
 	$(OBJS)\corelib_fldlgcmn.obj &
 	$(OBJS)\corelib_fontcmn.obj &
+	$(OBJS)\corelib_fontmap.obj &
 	$(OBJS)\corelib_framecmn.obj &
-	$(OBJS)\corelib_timercmn.obj &
-	$(OBJS)\corelib_toplvcmn.obj &
 	$(OBJS)\corelib_gaugecmn.obj &
 	$(OBJS)\corelib_gdicmn.obj &
 	$(OBJS)\corelib_geometry.obj &
@@ -1123,6 +1055,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_imagall.obj &
 	$(OBJS)\corelib_imagbmp.obj &
 	$(OBJS)\corelib_image.obj &
+	$(OBJS)\corelib_imagfill.obj &
 	$(OBJS)\corelib_imaggif.obj &
 	$(OBJS)\corelib_imagiff.obj &
 	$(OBJS)\corelib_imagjpeg.obj &
@@ -1131,7 +1064,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_imagpnm.obj &
 	$(OBJS)\corelib_imagtiff.obj &
 	$(OBJS)\corelib_imagxpm.obj &
-	$(OBJS)\corelib_imagfill.obj &
 	$(OBJS)\corelib_layout.obj &
 	$(OBJS)\corelib_lboxcmn.obj &
 	$(OBJS)\corelib_matrix.obj &
@@ -1149,12 +1081,34 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_statbar.obj &
 	$(OBJS)\corelib_tbarbase.obj &
 	$(OBJS)\corelib_textcmn.obj &
+	$(OBJS)\corelib_timercmn.obj &
+	$(OBJS)\corelib_toplvcmn.obj &
 	$(OBJS)\corelib_treebase.obj &
 	$(OBJS)\corelib_valgen.obj &
 	$(OBJS)\corelib_validate.obj &
 	$(OBJS)\corelib_valtext.obj &
 	$(OBJS)\corelib_wincmn.obj &
-	$(OBJS)\corelib_xpmdecod.obj
+	$(OBJS)\corelib_xpmdecod.obj &
+	$(OBJS)\corelib_busyinfo.obj &
+	$(OBJS)\corelib_choicdgg.obj &
+	$(OBJS)\corelib_dcpsg.obj &
+	$(OBJS)\corelib_dirctrlg.obj &
+	$(OBJS)\corelib_dragimgg.obj &
+	$(OBJS)\corelib_logg.obj &
+	$(OBJS)\corelib_numdlgg.obj &
+	$(OBJS)\corelib_panelg.obj &
+	$(OBJS)\corelib_progdlgg.obj &
+	$(OBJS)\corelib_renderg.obj &
+	$(OBJS)\corelib_scrlwing.obj &
+	$(OBJS)\corelib_selstore.obj &
+	$(OBJS)\corelib_spinctlg.obj &
+	$(OBJS)\corelib_splitter.obj &
+	$(OBJS)\corelib_tbarsmpl.obj &
+	$(OBJS)\corelib_textdlgg.obj &
+	$(OBJS)\corelib_tipwin.obj &
+	$(OBJS)\corelib_treectlg.obj &
+	$(OBJS)\corelib_vlbox.obj &
+	$(OBJS)\corelib_vscroll.obj
 !endif
 !endif
 !ifeq USE_GUI 1
@@ -1187,28 +1141,38 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_helpchm.obj &
 	$(OBJS)\corelib_helpwin.obj &
 	$(OBJS)\corelib_icon.obj &
-	$(OBJS)\corelib_joystick.obj &
 	$(OBJS)\corelib_minifram.obj &
+	$(OBJS)\corelib_automtn.obj &
+	$(OBJS)\corelib_dataobj.obj &
+	$(OBJS)\corelib_dropsrc.obj &
+	$(OBJS)\corelib_droptgt.obj &
+	$(OBJS)\corelib_oleutils.obj &
+	$(OBJS)\corelib_uuid.obj &
 	$(OBJS)\corelib_palette.obj &
 	$(OBJS)\corelib_pen.obj &
 	$(OBJS)\corelib_popupwin.obj &
 	$(OBJS)\corelib_region.obj &
+	$(OBJS)\corelib_renderer.obj &
 	$(OBJS)\corelib_settings.obj &
-	$(OBJS)\corelib_taskbarcmn.obj &
-	$(OBJS)\corelib_taskbar.obj &
 	$(OBJS)\corelib_timer.obj &
 	$(OBJS)\corelib_tooltip.obj &
 	$(OBJS)\corelib_toplevel.obj &
 	$(OBJS)\corelib_utilsgui.obj &
-	$(OBJS)\corelib_wave.obj &
+	$(OBJS)\corelib_uxtheme.obj &
 	$(OBJS)\corelib_window.obj &
-	$(OBJS)\corelib_automtn.obj &
-	$(OBJS)\corelib_dataobj.obj &
-	$(OBJS)\corelib_dropsrc.obj &
-	$(OBJS)\corelib_droptgt.obj &
-	$(OBJS)\corelib_oleutils.obj &
-	$(OBJS)\corelib_uuid.obj &
 	$(OBJS)\corelib_textctrl.obj &
+	$(OBJS)\corelib_accel.obj &
+	$(OBJS)\corelib_colrdlgg.obj &
+	$(OBJS)\corelib_dirdlgg.obj &
+	$(OBJS)\corelib_fdrepdlg.obj &
+	$(OBJS)\corelib_filedlgg.obj &
+	$(OBJS)\corelib_fontdlgg.obj &
+	$(OBJS)\corelib_imaglist.obj &
+	$(OBJS)\corelib_listctrl.obj &
+	$(OBJS)\corelib_mdig.obj &
+	$(OBJS)\corelib_msgdlgg.obj &
+	$(OBJS)\corelib_prntdlgg.obj &
+	$(OBJS)\corelib_tabg.obj &
 	$(OBJS)\corelib_bmpbuttn.obj &
 	$(OBJS)\corelib_button.obj &
 	$(OBJS)\corelib_checkbox.obj &
@@ -1217,9 +1181,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_colschem.obj &
 	$(OBJS)\corelib_combobox.obj &
 	$(OBJS)\corelib_control.obj &
+	$(OBJS)\corelib_ctrlrend.obj &
 	$(OBJS)\corelib_dialog.obj &
 	$(OBJS)\corelib_framuniv.obj &
-	$(OBJS)\corelib_topluniv.obj &
 	$(OBJS)\corelib_gauge.obj &
 	$(OBJS)\corelib_inpcons.obj &
 	$(OBJS)\corelib_inphand.obj &
@@ -1228,7 +1192,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_notebook.obj &
 	$(OBJS)\corelib_radiobox.obj &
 	$(OBJS)\corelib_radiobut.obj &
-	$(OBJS)\corelib_renderer.obj &
 	$(OBJS)\corelib_scrarrow.obj &
 	$(OBJS)\corelib_scrolbar.obj &
 	$(OBJS)\corelib_scrthumb.obj &
@@ -1239,58 +1202,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_statline.obj &
 	$(OBJS)\corelib_stattext.obj &
 	$(OBJS)\corelib_statusbr.obj &
-	$(OBJS)\corelib_toolbar.obj &
 	$(OBJS)\corelib_theme.obj &
+	$(OBJS)\corelib_toolbar.obj &
+	$(OBJS)\corelib_topluniv.obj &
 	$(OBJS)\corelib_winuniv.obj &
-	$(OBJS)\corelib_mdig.obj &
-	$(OBJS)\corelib_imaglist.obj &
-	$(OBJS)\corelib_colrdlgg.obj &
-	$(OBJS)\corelib_listctrl.obj &
-	$(OBJS)\corelib_filedlgg.obj &
-	$(OBJS)\corelib_dirdlgg.obj &
-	$(OBJS)\corelib_prntdlgg.obj &
-	$(OBJS)\corelib_accel.obj &
-	$(OBJS)\corelib_msgdlgg.obj &
-	$(OBJS)\corelib_fdrepdlg.obj &
-	$(OBJS)\corelib_fontdlgg.obj &
-	$(OBJS)\corelib_tabg.obj &
 	$(OBJS)\corelib_gtk.obj &
-	$(OBJS)\corelib_win32.obj &
 	$(OBJS)\corelib_metal.obj &
-	$(OBJS)\corelib_busyinfo.obj &
-	$(OBJS)\corelib_calctrl.obj &
-	$(OBJS)\corelib_choicdgg.obj &
-	$(OBJS)\corelib_dcbuffer.obj &
-	$(OBJS)\corelib_dcpsg.obj &
-	$(OBJS)\corelib_dirctrlg.obj &
-	$(OBJS)\corelib_dragimgg.obj &
-	$(OBJS)\corelib_grid.obj &
-	$(OBJS)\corelib_gridctrl.obj &
-	$(OBJS)\corelib_gridsel.obj &
-	$(OBJS)\corelib_helpext.obj &
-	$(OBJS)\corelib_laywin.obj &
-	$(OBJS)\corelib_logg.obj &
-	$(OBJS)\corelib_numdlgg.obj &
-	$(OBJS)\corelib_panelg.obj &
-	$(OBJS)\corelib_progdlgg.obj &
-	$(OBJS)\corelib_renderg.obj &
-	$(OBJS)\corelib_sashwin.obj &
-	$(OBJS)\corelib_scrlwing.obj &
-	$(OBJS)\corelib_selstore.obj &
-	$(OBJS)\corelib_spinctlg.obj &
-	$(OBJS)\corelib_splash.obj &
-	$(OBJS)\corelib_splitter.obj &
-	$(OBJS)\corelib_tbarsmpl.obj &
-	$(OBJS)\corelib_textdlgg.obj &
-	$(OBJS)\corelib_tipdlg.obj &
-	$(OBJS)\corelib_tipwin.obj &
-	$(OBJS)\corelib_treectlg.obj &
-	$(OBJS)\corelib_vlbox.obj &
-	$(OBJS)\corelib_vscroll.obj &
-	$(OBJS)\corelib_wizard.obj &
-	$(OBJS)\corelib_appcmn.obj &
-	$(OBJS)\corelib_fontmap.obj &
+	$(OBJS)\corelib_win32.obj &
 	$(OBJS)\corelib_accesscmn.obj &
+	$(OBJS)\corelib_appcmn.obj &
 	$(OBJS)\corelib_artprov.obj &
 	$(OBJS)\corelib_artstd.obj &
 	$(OBJS)\corelib_bmpbase.obj &
@@ -1303,7 +1223,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_ctrlcmn.obj &
 	$(OBJS)\corelib_ctrlsub.obj &
 	$(OBJS)\corelib_datacmn.obj &
-	$(OBJS)\corelib_dbgrid.obj &
 	$(OBJS)\corelib_dcbase.obj &
 	$(OBJS)\corelib_dlgcmn.obj &
 	$(OBJS)\corelib_dndcmn.obj &
@@ -1316,9 +1235,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_fddlgcmn.obj &
 	$(OBJS)\corelib_fldlgcmn.obj &
 	$(OBJS)\corelib_fontcmn.obj &
+	$(OBJS)\corelib_fontmap.obj &
 	$(OBJS)\corelib_framecmn.obj &
-	$(OBJS)\corelib_timercmn.obj &
-	$(OBJS)\corelib_toplvcmn.obj &
 	$(OBJS)\corelib_gaugecmn.obj &
 	$(OBJS)\corelib_gdicmn.obj &
 	$(OBJS)\corelib_geometry.obj &
@@ -1328,6 +1246,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_imagall.obj &
 	$(OBJS)\corelib_imagbmp.obj &
 	$(OBJS)\corelib_image.obj &
+	$(OBJS)\corelib_imagfill.obj &
 	$(OBJS)\corelib_imaggif.obj &
 	$(OBJS)\corelib_imagiff.obj &
 	$(OBJS)\corelib_imagjpeg.obj &
@@ -1336,7 +1255,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_imagpnm.obj &
 	$(OBJS)\corelib_imagtiff.obj &
 	$(OBJS)\corelib_imagxpm.obj &
-	$(OBJS)\corelib_imagfill.obj &
 	$(OBJS)\corelib_layout.obj &
 	$(OBJS)\corelib_lboxcmn.obj &
 	$(OBJS)\corelib_matrix.obj &
@@ -1354,12 +1272,34 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_statbar.obj &
 	$(OBJS)\corelib_tbarbase.obj &
 	$(OBJS)\corelib_textcmn.obj &
+	$(OBJS)\corelib_timercmn.obj &
+	$(OBJS)\corelib_toplvcmn.obj &
 	$(OBJS)\corelib_treebase.obj &
 	$(OBJS)\corelib_valgen.obj &
 	$(OBJS)\corelib_validate.obj &
 	$(OBJS)\corelib_valtext.obj &
 	$(OBJS)\corelib_wincmn.obj &
-	$(OBJS)\corelib_xpmdecod.obj
+	$(OBJS)\corelib_xpmdecod.obj &
+	$(OBJS)\corelib_busyinfo.obj &
+	$(OBJS)\corelib_choicdgg.obj &
+	$(OBJS)\corelib_dcpsg.obj &
+	$(OBJS)\corelib_dirctrlg.obj &
+	$(OBJS)\corelib_dragimgg.obj &
+	$(OBJS)\corelib_logg.obj &
+	$(OBJS)\corelib_numdlgg.obj &
+	$(OBJS)\corelib_panelg.obj &
+	$(OBJS)\corelib_progdlgg.obj &
+	$(OBJS)\corelib_renderg.obj &
+	$(OBJS)\corelib_scrlwing.obj &
+	$(OBJS)\corelib_selstore.obj &
+	$(OBJS)\corelib_spinctlg.obj &
+	$(OBJS)\corelib_splitter.obj &
+	$(OBJS)\corelib_tbarsmpl.obj &
+	$(OBJS)\corelib_textdlgg.obj &
+	$(OBJS)\corelib_tipwin.obj &
+	$(OBJS)\corelib_treectlg.obj &
+	$(OBJS)\corelib_vlbox.obj &
+	$(OBJS)\corelib_vscroll.obj
 !endif
 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =
@@ -1393,30 +1333,26 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_helpchm.obj &
 	$(OBJS)\monodll_helpwin.obj &
 	$(OBJS)\monodll_icon.obj &
-	$(OBJS)\monodll_joystick.obj &
 	$(OBJS)\monodll_minifram.obj &
+	$(OBJS)\monodll_automtn.obj &
+	$(OBJS)\monodll_dataobj.obj &
+	$(OBJS)\monodll_dropsrc.obj &
+	$(OBJS)\monodll_droptgt.obj &
+	$(OBJS)\monodll_oleutils.obj &
+	$(OBJS)\monodll_uuid.obj &
 	$(OBJS)\monodll_palette.obj &
 	$(OBJS)\monodll_pen.obj &
 	$(OBJS)\monodll_popupwin.obj &
 	$(OBJS)\monodll_region.obj &
+	$(OBJS)\monodll_renderer.obj &
 	$(OBJS)\monodll_settings.obj &
-	$(OBJS)\monodll_taskbarcmn.obj &
-	$(OBJS)\monodll_taskbar.obj &
 	$(OBJS)\monodll_timer.obj &
 	$(OBJS)\monodll_tooltip.obj &
 	$(OBJS)\monodll_toplevel.obj &
 	$(OBJS)\monodll_utilsgui.obj &
-	$(OBJS)\monodll_wave.obj &
+	$(OBJS)\monodll_uxtheme.obj &
 	$(OBJS)\monodll_window.obj &
-	$(OBJS)\monodll_automtn.obj &
-	$(OBJS)\monodll_dataobj.obj &
-	$(OBJS)\monodll_dropsrc.obj &
-	$(OBJS)\monodll_droptgt.obj &
-	$(OBJS)\monodll_oleutils.obj &
-	$(OBJS)\monodll_uuid.obj &
 	$(OBJS)\monodll_statusbr.obj &
-	$(OBJS)\monodll_uxtheme.obj &
-	$(OBJS)\monodll_access.obj &
 	$(OBJS)\monodll_accel.obj &
 	$(OBJS)\monodll_bmpbuttn.obj &
 	$(OBJS)\monodll_button.obj &
@@ -1444,13 +1380,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_msgdlg.obj &
 	$(OBJS)\monodll_nativdlg.obj &
 	$(OBJS)\monodll_notebook.obj &
+	$(OBJS)\monodll_access.obj &
 	$(OBJS)\monodll_ownerdrw.obj &
 	$(OBJS)\monodll_penwin.obj &
 	$(OBJS)\monodll_printdlg.obj &
 	$(OBJS)\monodll_printwin.obj &
 	$(OBJS)\monodll_radiobox.obj &
 	$(OBJS)\monodll_radiobut.obj &
-	$(OBJS)\monodll_renderer.obj &
 	$(OBJS)\monodll_scrolbar.obj &
 	$(OBJS)\monodll_slider95.obj &
 	$(OBJS)\monodll_spinbutt.obj &
@@ -1465,40 +1401,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_textctrl.obj &
 	$(OBJS)\monodll_tglbtn.obj &
 	$(OBJS)\monodll_treectrl.obj &
-	$(OBJS)\monodll_busyinfo.obj &
-	$(OBJS)\monodll_calctrl.obj &
-	$(OBJS)\monodll_choicdgg.obj &
-	$(OBJS)\monodll_dcbuffer.obj &
-	$(OBJS)\monodll_dcpsg.obj &
-	$(OBJS)\monodll_dirctrlg.obj &
-	$(OBJS)\monodll_dragimgg.obj &
-	$(OBJS)\monodll_grid.obj &
-	$(OBJS)\monodll_gridctrl.obj &
-	$(OBJS)\monodll_gridsel.obj &
-	$(OBJS)\monodll_helpext.obj &
-	$(OBJS)\monodll_laywin.obj &
-	$(OBJS)\monodll_logg.obj &
-	$(OBJS)\monodll_numdlgg.obj &
-	$(OBJS)\monodll_panelg.obj &
-	$(OBJS)\monodll_progdlgg.obj &
-	$(OBJS)\monodll_renderg.obj &
-	$(OBJS)\monodll_sashwin.obj &
-	$(OBJS)\monodll_scrlwing.obj &
-	$(OBJS)\monodll_selstore.obj &
-	$(OBJS)\monodll_spinctlg.obj &
-	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_splitter.obj &
-	$(OBJS)\monodll_tbarsmpl.obj &
-	$(OBJS)\monodll_textdlgg.obj &
-	$(OBJS)\monodll_tipdlg.obj &
-	$(OBJS)\monodll_tipwin.obj &
-	$(OBJS)\monodll_treectlg.obj &
-	$(OBJS)\monodll_vlbox.obj &
-	$(OBJS)\monodll_vscroll.obj &
-	$(OBJS)\monodll_wizard.obj &
-	$(OBJS)\monodll_appcmn.obj &
-	$(OBJS)\monodll_fontmap.obj &
 	$(OBJS)\monodll_accesscmn.obj &
+	$(OBJS)\monodll_appcmn.obj &
 	$(OBJS)\monodll_artprov.obj &
 	$(OBJS)\monodll_artstd.obj &
 	$(OBJS)\monodll_bmpbase.obj &
@@ -1511,7 +1415,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_ctrlcmn.obj &
 	$(OBJS)\monodll_ctrlsub.obj &
 	$(OBJS)\monodll_datacmn.obj &
-	$(OBJS)\monodll_dbgrid.obj &
 	$(OBJS)\monodll_dcbase.obj &
 	$(OBJS)\monodll_dlgcmn.obj &
 	$(OBJS)\monodll_dndcmn.obj &
@@ -1524,9 +1427,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_fddlgcmn.obj &
 	$(OBJS)\monodll_fldlgcmn.obj &
 	$(OBJS)\monodll_fontcmn.obj &
+	$(OBJS)\monodll_fontmap.obj &
 	$(OBJS)\monodll_framecmn.obj &
-	$(OBJS)\monodll_timercmn.obj &
-	$(OBJS)\monodll_toplvcmn.obj &
 	$(OBJS)\monodll_gaugecmn.obj &
 	$(OBJS)\monodll_gdicmn.obj &
 	$(OBJS)\monodll_geometry.obj &
@@ -1536,6 +1438,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_imagall.obj &
 	$(OBJS)\monodll_imagbmp.obj &
 	$(OBJS)\monodll_image.obj &
+	$(OBJS)\monodll_imagfill.obj &
 	$(OBJS)\monodll_imaggif.obj &
 	$(OBJS)\monodll_imagiff.obj &
 	$(OBJS)\monodll_imagjpeg.obj &
@@ -1544,7 +1447,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_imagpnm.obj &
 	$(OBJS)\monodll_imagtiff.obj &
 	$(OBJS)\monodll_imagxpm.obj &
-	$(OBJS)\monodll_imagfill.obj &
 	$(OBJS)\monodll_layout.obj &
 	$(OBJS)\monodll_lboxcmn.obj &
 	$(OBJS)\monodll_matrix.obj &
@@ -1562,12 +1464,34 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_statbar.obj &
 	$(OBJS)\monodll_tbarbase.obj &
 	$(OBJS)\monodll_textcmn.obj &
+	$(OBJS)\monodll_timercmn.obj &
+	$(OBJS)\monodll_toplvcmn.obj &
 	$(OBJS)\monodll_treebase.obj &
 	$(OBJS)\monodll_valgen.obj &
 	$(OBJS)\monodll_validate.obj &
 	$(OBJS)\monodll_valtext.obj &
 	$(OBJS)\monodll_wincmn.obj &
-	$(OBJS)\monodll_xpmdecod.obj
+	$(OBJS)\monodll_xpmdecod.obj &
+	$(OBJS)\monodll_busyinfo.obj &
+	$(OBJS)\monodll_choicdgg.obj &
+	$(OBJS)\monodll_dcpsg.obj &
+	$(OBJS)\monodll_dirctrlg.obj &
+	$(OBJS)\monodll_dragimgg.obj &
+	$(OBJS)\monodll_logg.obj &
+	$(OBJS)\monodll_numdlgg.obj &
+	$(OBJS)\monodll_panelg.obj &
+	$(OBJS)\monodll_progdlgg.obj &
+	$(OBJS)\monodll_renderg.obj &
+	$(OBJS)\monodll_scrlwing.obj &
+	$(OBJS)\monodll_selstore.obj &
+	$(OBJS)\monodll_spinctlg.obj &
+	$(OBJS)\monodll_splitter.obj &
+	$(OBJS)\monodll_tbarsmpl.obj &
+	$(OBJS)\monodll_textdlgg.obj &
+	$(OBJS)\monodll_tipwin.obj &
+	$(OBJS)\monodll_treectlg.obj &
+	$(OBJS)\monodll_vlbox.obj &
+	$(OBJS)\monodll_vscroll.obj
 !endif
 !endif
 !ifeq USE_GUI 1
@@ -1600,28 +1524,38 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_helpchm.obj &
 	$(OBJS)\monodll_helpwin.obj &
 	$(OBJS)\monodll_icon.obj &
-	$(OBJS)\monodll_joystick.obj &
 	$(OBJS)\monodll_minifram.obj &
+	$(OBJS)\monodll_automtn.obj &
+	$(OBJS)\monodll_dataobj.obj &
+	$(OBJS)\monodll_dropsrc.obj &
+	$(OBJS)\monodll_droptgt.obj &
+	$(OBJS)\monodll_oleutils.obj &
+	$(OBJS)\monodll_uuid.obj &
 	$(OBJS)\monodll_palette.obj &
 	$(OBJS)\monodll_pen.obj &
 	$(OBJS)\monodll_popupwin.obj &
 	$(OBJS)\monodll_region.obj &
+	$(OBJS)\monodll_renderer.obj &
 	$(OBJS)\monodll_settings.obj &
-	$(OBJS)\monodll_taskbarcmn.obj &
-	$(OBJS)\monodll_taskbar.obj &
 	$(OBJS)\monodll_timer.obj &
 	$(OBJS)\monodll_tooltip.obj &
 	$(OBJS)\monodll_toplevel.obj &
 	$(OBJS)\monodll_utilsgui.obj &
-	$(OBJS)\monodll_wave.obj &
+	$(OBJS)\monodll_uxtheme.obj &
 	$(OBJS)\monodll_window.obj &
-	$(OBJS)\monodll_automtn.obj &
-	$(OBJS)\monodll_dataobj.obj &
-	$(OBJS)\monodll_dropsrc.obj &
-	$(OBJS)\monodll_droptgt.obj &
-	$(OBJS)\monodll_oleutils.obj &
-	$(OBJS)\monodll_uuid.obj &
 	$(OBJS)\monodll_textctrl.obj &
+	$(OBJS)\monodll_accel.obj &
+	$(OBJS)\monodll_colrdlgg.obj &
+	$(OBJS)\monodll_dirdlgg.obj &
+	$(OBJS)\monodll_fdrepdlg.obj &
+	$(OBJS)\monodll_filedlgg.obj &
+	$(OBJS)\monodll_fontdlgg.obj &
+	$(OBJS)\monodll_imaglist.obj &
+	$(OBJS)\monodll_listctrl.obj &
+	$(OBJS)\monodll_mdig.obj &
+	$(OBJS)\monodll_msgdlgg.obj &
+	$(OBJS)\monodll_prntdlgg.obj &
+	$(OBJS)\monodll_tabg.obj &
 	$(OBJS)\monodll_bmpbuttn.obj &
 	$(OBJS)\monodll_button.obj &
 	$(OBJS)\monodll_checkbox.obj &
@@ -1630,9 +1564,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_colschem.obj &
 	$(OBJS)\monodll_combobox.obj &
 	$(OBJS)\monodll_control.obj &
+	$(OBJS)\monodll_ctrlrend.obj &
 	$(OBJS)\monodll_dialog.obj &
 	$(OBJS)\monodll_framuniv.obj &
-	$(OBJS)\monodll_topluniv.obj &
 	$(OBJS)\monodll_gauge.obj &
 	$(OBJS)\monodll_inpcons.obj &
 	$(OBJS)\monodll_inphand.obj &
@@ -1641,7 +1575,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_notebook.obj &
 	$(OBJS)\monodll_radiobox.obj &
 	$(OBJS)\monodll_radiobut.obj &
-	$(OBJS)\monodll_renderer.obj &
 	$(OBJS)\monodll_scrarrow.obj &
 	$(OBJS)\monodll_scrolbar.obj &
 	$(OBJS)\monodll_scrthumb.obj &
@@ -1652,58 +1585,15 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_statline.obj &
 	$(OBJS)\monodll_stattext.obj &
 	$(OBJS)\monodll_statusbr.obj &
-	$(OBJS)\monodll_toolbar.obj &
 	$(OBJS)\monodll_theme.obj &
+	$(OBJS)\monodll_toolbar.obj &
+	$(OBJS)\monodll_topluniv.obj &
 	$(OBJS)\monodll_winuniv.obj &
-	$(OBJS)\monodll_mdig.obj &
-	$(OBJS)\monodll_imaglist.obj &
-	$(OBJS)\monodll_colrdlgg.obj &
-	$(OBJS)\monodll_listctrl.obj &
-	$(OBJS)\monodll_filedlgg.obj &
-	$(OBJS)\monodll_dirdlgg.obj &
-	$(OBJS)\monodll_prntdlgg.obj &
-	$(OBJS)\monodll_accel.obj &
-	$(OBJS)\monodll_msgdlgg.obj &
-	$(OBJS)\monodll_fdrepdlg.obj &
-	$(OBJS)\monodll_fontdlgg.obj &
-	$(OBJS)\monodll_tabg.obj &
 	$(OBJS)\monodll_gtk.obj &
-	$(OBJS)\monodll_win32.obj &
 	$(OBJS)\monodll_metal.obj &
-	$(OBJS)\monodll_busyinfo.obj &
-	$(OBJS)\monodll_calctrl.obj &
-	$(OBJS)\monodll_choicdgg.obj &
-	$(OBJS)\monodll_dcbuffer.obj &
-	$(OBJS)\monodll_dcpsg.obj &
-	$(OBJS)\monodll_dirctrlg.obj &
-	$(OBJS)\monodll_dragimgg.obj &
-	$(OBJS)\monodll_grid.obj &
-	$(OBJS)\monodll_gridctrl.obj &
-	$(OBJS)\monodll_gridsel.obj &
-	$(OBJS)\monodll_helpext.obj &
-	$(OBJS)\monodll_laywin.obj &
-	$(OBJS)\monodll_logg.obj &
-	$(OBJS)\monodll_numdlgg.obj &
-	$(OBJS)\monodll_panelg.obj &
-	$(OBJS)\monodll_progdlgg.obj &
-	$(OBJS)\monodll_renderg.obj &
-	$(OBJS)\monodll_sashwin.obj &
-	$(OBJS)\monodll_scrlwing.obj &
-	$(OBJS)\monodll_selstore.obj &
-	$(OBJS)\monodll_spinctlg.obj &
-	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_splitter.obj &
-	$(OBJS)\monodll_tbarsmpl.obj &
-	$(OBJS)\monodll_textdlgg.obj &
-	$(OBJS)\monodll_tipdlg.obj &
-	$(OBJS)\monodll_tipwin.obj &
-	$(OBJS)\monodll_treectlg.obj &
-	$(OBJS)\monodll_vlbox.obj &
-	$(OBJS)\monodll_vscroll.obj &
-	$(OBJS)\monodll_wizard.obj &
-	$(OBJS)\monodll_appcmn.obj &
-	$(OBJS)\monodll_fontmap.obj &
+	$(OBJS)\monodll_win32.obj &
 	$(OBJS)\monodll_accesscmn.obj &
+	$(OBJS)\monodll_appcmn.obj &
 	$(OBJS)\monodll_artprov.obj &
 	$(OBJS)\monodll_artstd.obj &
 	$(OBJS)\monodll_bmpbase.obj &
@@ -1716,7 +1606,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_ctrlcmn.obj &
 	$(OBJS)\monodll_ctrlsub.obj &
 	$(OBJS)\monodll_datacmn.obj &
-	$(OBJS)\monodll_dbgrid.obj &
 	$(OBJS)\monodll_dcbase.obj &
 	$(OBJS)\monodll_dlgcmn.obj &
 	$(OBJS)\monodll_dndcmn.obj &
@@ -1729,9 +1618,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_fddlgcmn.obj &
 	$(OBJS)\monodll_fldlgcmn.obj &
 	$(OBJS)\monodll_fontcmn.obj &
+	$(OBJS)\monodll_fontmap.obj &
 	$(OBJS)\monodll_framecmn.obj &
-	$(OBJS)\monodll_timercmn.obj &
-	$(OBJS)\monodll_toplvcmn.obj &
 	$(OBJS)\monodll_gaugecmn.obj &
 	$(OBJS)\monodll_gdicmn.obj &
 	$(OBJS)\monodll_geometry.obj &
@@ -1741,6 +1629,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_imagall.obj &
 	$(OBJS)\monodll_imagbmp.obj &
 	$(OBJS)\monodll_image.obj &
+	$(OBJS)\monodll_imagfill.obj &
 	$(OBJS)\monodll_imaggif.obj &
 	$(OBJS)\monodll_imagiff.obj &
 	$(OBJS)\monodll_imagjpeg.obj &
@@ -1749,7 +1638,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_imagpnm.obj &
 	$(OBJS)\monodll_imagtiff.obj &
 	$(OBJS)\monodll_imagxpm.obj &
-	$(OBJS)\monodll_imagfill.obj &
 	$(OBJS)\monodll_layout.obj &
 	$(OBJS)\monodll_lboxcmn.obj &
 	$(OBJS)\monodll_matrix.obj &
@@ -1767,67 +1655,143 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_statbar.obj &
 	$(OBJS)\monodll_tbarbase.obj &
 	$(OBJS)\monodll_textcmn.obj &
+	$(OBJS)\monodll_timercmn.obj &
+	$(OBJS)\monodll_toplvcmn.obj &
 	$(OBJS)\monodll_treebase.obj &
 	$(OBJS)\monodll_valgen.obj &
 	$(OBJS)\monodll_validate.obj &
 	$(OBJS)\monodll_valtext.obj &
 	$(OBJS)\monodll_wincmn.obj &
-	$(OBJS)\monodll_xpmdecod.obj
+	$(OBJS)\monodll_xpmdecod.obj &
+	$(OBJS)\monodll_busyinfo.obj &
+	$(OBJS)\monodll_choicdgg.obj &
+	$(OBJS)\monodll_dcpsg.obj &
+	$(OBJS)\monodll_dirctrlg.obj &
+	$(OBJS)\monodll_dragimgg.obj &
+	$(OBJS)\monodll_logg.obj &
+	$(OBJS)\monodll_numdlgg.obj &
+	$(OBJS)\monodll_panelg.obj &
+	$(OBJS)\monodll_progdlgg.obj &
+	$(OBJS)\monodll_renderg.obj &
+	$(OBJS)\monodll_scrlwing.obj &
+	$(OBJS)\monodll_selstore.obj &
+	$(OBJS)\monodll_spinctlg.obj &
+	$(OBJS)\monodll_splitter.obj &
+	$(OBJS)\monodll_tbarsmpl.obj &
+	$(OBJS)\monodll_textdlgg.obj &
+	$(OBJS)\monodll_tipwin.obj &
+	$(OBJS)\monodll_treectlg.obj &
+	$(OBJS)\monodll_vlbox.obj &
+	$(OBJS)\monodll_vscroll.obj
 !endif
 !endif
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(____CORE_SRC_FILENAMES_1_OBJECTS) &
+	$(OBJS)\monolib_calctrl.obj &
+	$(OBJS)\monolib_dcbuffer.obj &
+	$(OBJS)\monolib_grid.obj &
+	$(OBJS)\monolib_gridctrl.obj &
+	$(OBJS)\monolib_gridsel.obj &
+	$(OBJS)\monolib_helpext.obj &
+	$(OBJS)\monolib_laywin.obj &
+	$(OBJS)\monolib_sashwin.obj &
+	$(OBJS)\monolib_splash.obj &
+	$(OBJS)\monolib_tipdlg.obj &
+	$(OBJS)\monolib_wizard.obj &
+	$(OBJS)\monolib_taskbarcmn.obj &
+	$(OBJS)\monolib_joystick.obj &
+	$(OBJS)\monolib_taskbar.obj &
+	$(OBJS)\monolib_wave.obj &
 	$(OBJS)\monolib_helpbest.obj &
+	$(OBJS)\monolib_helpctrl.obj &
 	$(OBJS)\monolib_helpdata.obj &
 	$(OBJS)\monolib_helpfrm.obj &
-	$(OBJS)\monolib_helpctrl.obj &
 	$(OBJS)\monolib_htmlcell.obj &
 	$(OBJS)\monolib_htmlfilt.obj &
 	$(OBJS)\monolib_htmlpars.obj &
 	$(OBJS)\monolib_htmltag.obj &
 	$(OBJS)\monolib_htmlwin.obj &
-	$(OBJS)\monolib_winpars.obj &
+	$(OBJS)\monolib_htmprint.obj &
+	$(OBJS)\monolib_m_dflist.obj &
 	$(OBJS)\monolib_m_fonts.obj &
 	$(OBJS)\monolib_m_hline.obj &
 	$(OBJS)\monolib_m_image.obj &
 	$(OBJS)\monolib_m_layout.obj &
 	$(OBJS)\monolib_m_links.obj &
 	$(OBJS)\monolib_m_list.obj &
-	$(OBJS)\monolib_m_dflist.obj &
 	$(OBJS)\monolib_m_pre.obj &
-	$(OBJS)\monolib_m_tables.obj &
 	$(OBJS)\monolib_m_style.obj &
-	$(OBJS)\monolib_htmprint.obj &
-	$(OBJS)\monolib_htmllbox.obj
+	$(OBJS)\monolib_m_tables.obj &
+	$(OBJS)\monolib_winpars.obj &
+	$(OBJS)\monolib_htmllbox.obj &
+	$(OBJS)\monolib_db.obj &
+	$(OBJS)\monolib_dbtable.obj &
+	$(OBJS)\monolib_dbgrid.obj
 !endif
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
 	$(____CORE_SRC_FILENAMES_OBJECTS) &
+	$(OBJS)\monodll_calctrl.obj &
+	$(OBJS)\monodll_dcbuffer.obj &
+	$(OBJS)\monodll_grid.obj &
+	$(OBJS)\monodll_gridctrl.obj &
+	$(OBJS)\monodll_gridsel.obj &
+	$(OBJS)\monodll_helpext.obj &
+	$(OBJS)\monodll_laywin.obj &
+	$(OBJS)\monodll_sashwin.obj &
+	$(OBJS)\monodll_splash.obj &
+	$(OBJS)\monodll_tipdlg.obj &
+	$(OBJS)\monodll_wizard.obj &
+	$(OBJS)\monodll_taskbarcmn.obj &
+	$(OBJS)\monodll_joystick.obj &
+	$(OBJS)\monodll_taskbar.obj &
+	$(OBJS)\monodll_wave.obj &
 	$(OBJS)\monodll_helpbest.obj &
+	$(OBJS)\monodll_helpctrl.obj &
 	$(OBJS)\monodll_helpdata.obj &
 	$(OBJS)\monodll_helpfrm.obj &
-	$(OBJS)\monodll_helpctrl.obj &
 	$(OBJS)\monodll_htmlcell.obj &
 	$(OBJS)\monodll_htmlfilt.obj &
 	$(OBJS)\monodll_htmlpars.obj &
 	$(OBJS)\monodll_htmltag.obj &
 	$(OBJS)\monodll_htmlwin.obj &
-	$(OBJS)\monodll_winpars.obj &
+	$(OBJS)\monodll_htmprint.obj &
+	$(OBJS)\monodll_m_dflist.obj &
 	$(OBJS)\monodll_m_fonts.obj &
 	$(OBJS)\monodll_m_hline.obj &
 	$(OBJS)\monodll_m_image.obj &
 	$(OBJS)\monodll_m_layout.obj &
 	$(OBJS)\monodll_m_links.obj &
 	$(OBJS)\monodll_m_list.obj &
-	$(OBJS)\monodll_m_dflist.obj &
 	$(OBJS)\monodll_m_pre.obj &
-	$(OBJS)\monodll_m_tables.obj &
 	$(OBJS)\monodll_m_style.obj &
-	$(OBJS)\monodll_htmprint.obj &
-	$(OBJS)\monodll_htmllbox.obj
+	$(OBJS)\monodll_m_tables.obj &
+	$(OBJS)\monodll_winpars.obj &
+	$(OBJS)\monodll_htmllbox.obj &
+	$(OBJS)\monodll_db.obj &
+	$(OBJS)\monodll_dbtable.obj &
+	$(OBJS)\monodll_dbgrid.obj
+!endif
+__advdll___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+__advdll___depname = &
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll
+!endif
+!endif
+!endif
+__advlib___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 0
+!ifeq USE_GUI 1
+__advlib___depname = &
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+!endif
+!endif
 !endif
 __basedll___depname =
 !ifeq MONOLITHIC 0
@@ -1861,6 +1825,28 @@ __corelib___depname = &
 !endif
 !endif
 !endif
+__dbgriddll___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+__dbgriddll___depname = &
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll
+!endif
+!endif
+!endif
+!endif
+__dbgridlib___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 0
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+__dbgridlib___depname = &
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+!endif
+!endif
+!endif
+!endif
 __gldll___depname =
 !ifeq SHARED 1
 !ifeq USE_GUI 1
@@ -1925,6 +1911,28 @@ __netlib___depname = &
 	$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
 !endif
 !endif
+__odbcdll___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+__odbcdll___depname = &
+	$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll
+!endif
+!endif
+!endif
+!endif
+__odbclib___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 0
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+__odbclib___depname = &
+	$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+!endif
+!endif
+!endif
+!endif
 __wxjpeg___depname =
 !ifeq USE_GUI 1
 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
@@ -1954,13 +1962,58 @@ __xmllib___depname = &
 
 ### Variables: ###
 
-BASEDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+ADVDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
+	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
+	-i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $(CXXFLAGS) &
+	/fh=$(OBJS)\wxprec_advdll.pch
+ADVDLL_OBJECTS =  &
+	$(OBJS)\advdll_dummy.obj &
+	$(OBJS)\advdll_calctrl.obj &
+	$(OBJS)\advdll_dcbuffer.obj &
+	$(OBJS)\advdll_grid.obj &
+	$(OBJS)\advdll_gridctrl.obj &
+	$(OBJS)\advdll_gridsel.obj &
+	$(OBJS)\advdll_helpext.obj &
+	$(OBJS)\advdll_laywin.obj &
+	$(OBJS)\advdll_sashwin.obj &
+	$(OBJS)\advdll_splash.obj &
+	$(OBJS)\advdll_tipdlg.obj &
+	$(OBJS)\advdll_wizard.obj &
+	$(OBJS)\advdll_taskbarcmn.obj &
+	$(OBJS)\advdll_joystick.obj &
+	$(OBJS)\advdll_taskbar.obj &
+	$(OBJS)\advdll_wave.obj
+ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
+	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
+	-i=..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_advlib.pch
+ADVLIB_OBJECTS =  &
+	$(OBJS)\advlib_dummy.obj &
+	$(OBJS)\advlib_calctrl.obj &
+	$(OBJS)\advlib_dcbuffer.obj &
+	$(OBJS)\advlib_grid.obj &
+	$(OBJS)\advlib_gridctrl.obj &
+	$(OBJS)\advlib_gridsel.obj &
+	$(OBJS)\advlib_helpext.obj &
+	$(OBJS)\advlib_laywin.obj &
+	$(OBJS)\advlib_sashwin.obj &
+	$(OBJS)\advlib_splash.obj &
+	$(OBJS)\advlib_tipdlg.obj &
+	$(OBJS)\advlib_wizard.obj &
+	$(OBJS)\advlib_taskbarcmn.obj &
+	$(OBJS)\advlib_joystick.obj &
+	$(OBJS)\advlib_taskbar.obj &
+	$(OBJS)\advlib_wave.obj
+BASEDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
 	-i=..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 &
 	$(CFLAGS)
-BASEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+BASEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -1974,8 +2027,6 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_config.obj &
 	$(OBJS)\basedll_datetime.obj &
 	$(OBJS)\basedll_datstrm.obj &
-	$(OBJS)\basedll_db.obj &
-	$(OBJS)\basedll_dbtable.obj &
 	$(OBJS)\basedll_dircmn.obj &
 	$(OBJS)\basedll_dynarray.obj &
 	$(OBJS)\basedll_dynlib.obj &
@@ -2021,6 +2072,7 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_zipstrm.obj &
 	$(OBJS)\basedll_zstream.obj &
 	$(OBJS)\basedll_basemsw.obj &
+	$(OBJS)\basedll_crashrpt.obj &
 	$(OBJS)\basedll_dde.obj &
 	$(OBJS)\basedll_dir.obj &
 	$(OBJS)\basedll_mimetype.obj &
@@ -2030,7 +2082,6 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_thread.obj &
 	$(OBJS)\basedll_utils.obj &
 	$(OBJS)\basedll_utilsexc.obj &
-	$(OBJS)\basedll_crashrpt.obj &
 	$(OBJS)\basedll_event.obj &
 	$(OBJS)\basedll_fs_mem.obj &
 	$(OBJS)\basedll_msgout.obj &
@@ -2038,12 +2089,12 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_main.obj &
 	$(OBJS)\basedll_mslu.obj &
 	$(OBJS)\basedll_volume.obj
-BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
 	-i=..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CFLAGS)
-BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2057,8 +2108,6 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_config.obj &
 	$(OBJS)\baselib_datetime.obj &
 	$(OBJS)\baselib_datstrm.obj &
-	$(OBJS)\baselib_db.obj &
-	$(OBJS)\baselib_dbtable.obj &
 	$(OBJS)\baselib_dircmn.obj &
 	$(OBJS)\baselib_dynarray.obj &
 	$(OBJS)\baselib_dynlib.obj &
@@ -2104,6 +2153,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_zipstrm.obj &
 	$(OBJS)\baselib_zstream.obj &
 	$(OBJS)\baselib_basemsw.obj &
+	$(OBJS)\baselib_crashrpt.obj &
 	$(OBJS)\baselib_dde.obj &
 	$(OBJS)\baselib_dir.obj &
 	$(OBJS)\baselib_mimetype.obj &
@@ -2113,7 +2163,6 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_thread.obj &
 	$(OBJS)\baselib_utils.obj &
 	$(OBJS)\baselib_utilsexc.obj &
-	$(OBJS)\baselib_crashrpt.obj &
 	$(OBJS)\baselib_event.obj &
 	$(OBJS)\baselib_fs_mem.obj &
 	$(OBJS)\baselib_msgout.obj &
@@ -2121,7 +2170,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_main.obj &
 	$(OBJS)\baselib_mslu.obj &
 	$(OBJS)\baselib_volume.obj
-COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2137,7 +2186,7 @@ COREDLL_OBJECTS =  &
 	$(OBJS)\coredll_mslu.obj &
 	$(OBJS)\coredll_volume.obj &
 	$(____CORE_SRC_FILENAMES_2_OBJECTS)
-CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2153,7 +2202,24 @@ CORELIB_OBJECTS =  &
 	$(OBJS)\corelib_mslu.obj &
 	$(OBJS)\corelib_volume.obj &
 	$(____CORE_SRC_FILENAMES_3_OBJECTS)
-GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
+	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
+	-i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID $(CXXFLAGS) &
+	/fh=$(OBJS)\wxprec_dbgriddll.pch
+DBGRIDDLL_OBJECTS =  &
+	$(OBJS)\dbgriddll_dummy.obj &
+	$(OBJS)\dbgriddll_dbgrid.obj
+DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
+	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
+	-i=..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_dbgridlib.pch
+DBGRIDLIB_OBJECTS =  &
+	$(OBJS)\dbgridlib_dummy.obj &
+	$(OBJS)\dbgridlib_dbgrid.obj
+GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2162,7 +2228,7 @@ GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 GLDLL_OBJECTS =  &
 	$(OBJS)\gldll_dummy.obj &
 	$(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2170,7 +2236,7 @@ GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 GLLIB_OBJECTS =  &
 	$(OBJS)\gllib_dummy.obj &
 	$(OBJS)\gllib_glcanvas.obj
-HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2179,28 +2245,28 @@ HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 HTMLDLL_OBJECTS =  &
 	$(OBJS)\htmldll_dummy.obj &
 	$(OBJS)\htmldll_helpbest.obj &
+	$(OBJS)\htmldll_helpctrl.obj &
 	$(OBJS)\htmldll_helpdata.obj &
 	$(OBJS)\htmldll_helpfrm.obj &
-	$(OBJS)\htmldll_helpctrl.obj &
 	$(OBJS)\htmldll_htmlcell.obj &
 	$(OBJS)\htmldll_htmlfilt.obj &
 	$(OBJS)\htmldll_htmlpars.obj &
 	$(OBJS)\htmldll_htmltag.obj &
 	$(OBJS)\htmldll_htmlwin.obj &
-	$(OBJS)\htmldll_winpars.obj &
+	$(OBJS)\htmldll_htmprint.obj &
+	$(OBJS)\htmldll_m_dflist.obj &
 	$(OBJS)\htmldll_m_fonts.obj &
 	$(OBJS)\htmldll_m_hline.obj &
 	$(OBJS)\htmldll_m_image.obj &
 	$(OBJS)\htmldll_m_layout.obj &
 	$(OBJS)\htmldll_m_links.obj &
 	$(OBJS)\htmldll_m_list.obj &
-	$(OBJS)\htmldll_m_dflist.obj &
 	$(OBJS)\htmldll_m_pre.obj &
-	$(OBJS)\htmldll_m_tables.obj &
 	$(OBJS)\htmldll_m_style.obj &
-	$(OBJS)\htmldll_htmprint.obj &
+	$(OBJS)\htmldll_m_tables.obj &
+	$(OBJS)\htmldll_winpars.obj &
 	$(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2208,35 +2274,35 @@ HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 HTMLLIB_OBJECTS =  &
 	$(OBJS)\htmllib_dummy.obj &
 	$(OBJS)\htmllib_helpbest.obj &
+	$(OBJS)\htmllib_helpctrl.obj &
 	$(OBJS)\htmllib_helpdata.obj &
 	$(OBJS)\htmllib_helpfrm.obj &
-	$(OBJS)\htmllib_helpctrl.obj &
 	$(OBJS)\htmllib_htmlcell.obj &
 	$(OBJS)\htmllib_htmlfilt.obj &
 	$(OBJS)\htmllib_htmlpars.obj &
 	$(OBJS)\htmllib_htmltag.obj &
 	$(OBJS)\htmllib_htmlwin.obj &
-	$(OBJS)\htmllib_winpars.obj &
+	$(OBJS)\htmllib_htmprint.obj &
+	$(OBJS)\htmllib_m_dflist.obj &
 	$(OBJS)\htmllib_m_fonts.obj &
 	$(OBJS)\htmllib_m_hline.obj &
 	$(OBJS)\htmllib_m_image.obj &
 	$(OBJS)\htmllib_m_layout.obj &
 	$(OBJS)\htmllib_m_links.obj &
 	$(OBJS)\htmllib_m_list.obj &
-	$(OBJS)\htmllib_m_dflist.obj &
 	$(OBJS)\htmllib_m_pre.obj &
-	$(OBJS)\htmllib_m_tables.obj &
 	$(OBJS)\htmllib_m_style.obj &
-	$(OBJS)\htmllib_htmprint.obj &
+	$(OBJS)\htmllib_m_tables.obj &
+	$(OBJS)\htmllib_winpars.obj &
 	$(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = &
 	..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
 	-i=..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CFLAGS)
-MONODLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+MONODLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2250,8 +2316,6 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_config.obj &
 	$(OBJS)\monodll_datetime.obj &
 	$(OBJS)\monodll_datstrm.obj &
-	$(OBJS)\monodll_db.obj &
-	$(OBJS)\monodll_dbtable.obj &
 	$(OBJS)\monodll_dircmn.obj &
 	$(OBJS)\monodll_dynarray.obj &
 	$(OBJS)\monodll_dynlib.obj &
@@ -2297,6 +2361,7 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_zipstrm.obj &
 	$(OBJS)\monodll_zstream.obj &
 	$(OBJS)\monodll_basemsw.obj &
+	$(OBJS)\monodll_crashrpt.obj &
 	$(OBJS)\monodll_dde.obj &
 	$(OBJS)\monodll_dir.obj &
 	$(OBJS)\monodll_mimetype.obj &
@@ -2306,7 +2371,6 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_thread.obj &
 	$(OBJS)\monodll_utils.obj &
 	$(OBJS)\monodll_utilsexc.obj &
-	$(OBJS)\monodll_crashrpt.obj &
 	$(OBJS)\monodll_event.obj &
 	$(OBJS)\monodll_fs_mem.obj &
 	$(OBJS)\monodll_msgout.obj &
@@ -2318,22 +2382,22 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_ftp.obj &
 	$(OBJS)\monodll_http.obj &
 	$(OBJS)\monodll_protocol.obj &
-	$(OBJS)\monodll_url.obj &
-	$(OBJS)\monodll_sckfile.obj &
 	$(OBJS)\monodll_sckaddr.obj &
+	$(OBJS)\monodll_sckfile.obj &
 	$(OBJS)\monodll_sckipc.obj &
 	$(OBJS)\monodll_sckstrm.obj &
 	$(OBJS)\monodll_socket.obj &
+	$(OBJS)\monodll_url.obj &
 	$(OBJS)\monodll_gsocket.obj &
 	$(OBJS)\monodll_gsockmsw.obj &
 	$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) &
 	$(OBJS)\monodll_xml.obj
-MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
 	-i=..\src\expat\lib -dwxUSE_BASE=1 $(CFLAGS)
-MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2347,8 +2411,6 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_config.obj &
 	$(OBJS)\monolib_datetime.obj &
 	$(OBJS)\monolib_datstrm.obj &
-	$(OBJS)\monolib_db.obj &
-	$(OBJS)\monolib_dbtable.obj &
 	$(OBJS)\monolib_dircmn.obj &
 	$(OBJS)\monolib_dynarray.obj &
 	$(OBJS)\monolib_dynlib.obj &
@@ -2394,6 +2456,7 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_zipstrm.obj &
 	$(OBJS)\monolib_zstream.obj &
 	$(OBJS)\monolib_basemsw.obj &
+	$(OBJS)\monolib_crashrpt.obj &
 	$(OBJS)\monolib_dde.obj &
 	$(OBJS)\monolib_dir.obj &
 	$(OBJS)\monolib_mimetype.obj &
@@ -2403,7 +2466,6 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_thread.obj &
 	$(OBJS)\monolib_utils.obj &
 	$(OBJS)\monolib_utilsexc.obj &
-	$(OBJS)\monolib_crashrpt.obj &
 	$(OBJS)\monolib_event.obj &
 	$(OBJS)\monolib_fs_mem.obj &
 	$(OBJS)\monolib_msgout.obj &
@@ -2415,22 +2477,22 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_ftp.obj &
 	$(OBJS)\monolib_http.obj &
 	$(OBJS)\monolib_protocol.obj &
-	$(OBJS)\monolib_url.obj &
-	$(OBJS)\monolib_sckfile.obj &
 	$(OBJS)\monolib_sckaddr.obj &
+	$(OBJS)\monolib_sckfile.obj &
 	$(OBJS)\monolib_sckipc.obj &
 	$(OBJS)\monolib_sckstrm.obj &
 	$(OBJS)\monolib_socket.obj &
+	$(OBJS)\monolib_url.obj &
 	$(OBJS)\monolib_gsocket.obj &
 	$(OBJS)\monolib_gsockmsw.obj &
 	$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) &
 	$(OBJS)\monolib_xml.obj
-NETDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+NETDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
 	-i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS)
-NETDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+NETDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2442,20 +2504,20 @@ NETDLL_OBJECTS =  &
 	$(OBJS)\netdll_ftp.obj &
 	$(OBJS)\netdll_http.obj &
 	$(OBJS)\netdll_protocol.obj &
-	$(OBJS)\netdll_url.obj &
-	$(OBJS)\netdll_sckfile.obj &
 	$(OBJS)\netdll_sckaddr.obj &
+	$(OBJS)\netdll_sckfile.obj &
 	$(OBJS)\netdll_sckipc.obj &
 	$(OBJS)\netdll_sckstrm.obj &
 	$(OBJS)\netdll_socket.obj &
+	$(OBJS)\netdll_url.obj &
 	$(OBJS)\netdll_gsocket.obj &
 	$(OBJS)\netdll_gsockmsw.obj
-NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
 	-i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS)
-NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2467,23 +2529,42 @@ NETLIB_OBJECTS =  &
 	$(OBJS)\netlib_ftp.obj &
 	$(OBJS)\netlib_http.obj &
 	$(OBJS)\netlib_protocol.obj &
-	$(OBJS)\netlib_url.obj &
-	$(OBJS)\netlib_sckfile.obj &
 	$(OBJS)\netlib_sckaddr.obj &
+	$(OBJS)\netlib_sckfile.obj &
 	$(OBJS)\netlib_sckipc.obj &
 	$(OBJS)\netlib_sckstrm.obj &
 	$(OBJS)\netlib_socket.obj &
+	$(OBJS)\netlib_url.obj &
 	$(OBJS)\netlib_gsocket.obj &
 	$(OBJS)\netlib_gsockmsw.obj
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+ODBCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
+	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
+	-i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ODBC $(CXXFLAGS) &
+	/fh=$(OBJS)\wxprec_odbcdll.pch
+ODBCDLL_OBJECTS =  &
+	$(OBJS)\odbcdll_dummy.obj &
+	$(OBJS)\odbcdll_db.obj &
+	$(OBJS)\odbcdll_dbtable.obj
+ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
+	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
+	-i=..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_odbclib.pch
+ODBCLIB_OBJECTS =  &
+	$(OBJS)\odbclib_dummy.obj &
+	$(OBJS)\odbclib_db.obj &
+	$(OBJS)\odbclib_dbtable.obj
+WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -i=$(LIBDIRNAME) -dCOMPILED_FROM_DSP $(CFLAGS)
 WXEXPAT_OBJECTS =  &
 	$(OBJS)\wxexpat_xmlparse.obj &
 	$(OBJS)\wxexpat_xmlrole.obj &
 	$(OBJS)\wxexpat_xmltok.obj
-WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -i=$(LIBDIRNAME) $(CFLAGS)
 WXJPEG_OBJECTS =  &
 	$(OBJS)\wxjpeg_jcomapi.obj &
@@ -2532,7 +2613,7 @@ WXJPEG_OBJECTS =  &
 	$(OBJS)\wxjpeg_jquant1.obj &
 	$(OBJS)\wxjpeg_jquant2.obj &
 	$(OBJS)\wxjpeg_jdmerge.obj
-WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -i=..\src\zlib $(CFLAGS)
 WXPNG_OBJECTS =  &
 	$(OBJS)\wxpng_png.obj &
@@ -2552,14 +2633,14 @@ WXPNG_OBJECTS =  &
 	$(OBJS)\wxpng_pngwrite.obj &
 	$(OBJS)\wxpng_pngwtran.obj &
 	$(OBJS)\wxpng_pngwutil.obj
-WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) $(CFLAGS)
 WXREGEX_OBJECTS =  &
 	$(OBJS)\wxregex_regcomp.obj &
 	$(OBJS)\wxregex_regexec.obj &
 	$(OBJS)\wxregex_regerror.obj &
 	$(OBJS)\wxregex_regfree.obj
-WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) $(CFLAGS)
 WXTIFF_OBJECTS =  &
 	$(OBJS)\wxtiff_tif_win32.obj &
@@ -2595,7 +2676,7 @@ WXTIFF_OBJECTS =  &
 	$(OBJS)\wxtiff_tif_warning.obj &
 	$(OBJS)\wxtiff_tif_write.obj &
 	$(OBJS)\wxtiff_tif_zip.obj
-WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) $(CFLAGS)
 WXZLIB_OBJECTS =  &
 	$(OBJS)\wxzlib_adler32.obj &
@@ -2612,7 +2693,7 @@ WXZLIB_OBJECTS =  &
 	$(OBJS)\wxzlib_infcodes.obj &
 	$(OBJS)\wxzlib_infutil.obj &
 	$(OBJS)\wxzlib_inffast.obj
-XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2621,7 +2702,7 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 XMLDLL_OBJECTS =  &
 	$(OBJS)\xmldll_dummy.obj &
 	$(OBJS)\xmldll_xml.obj
-XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
 	-i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
@@ -2638,7 +2719,103 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname)
+all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname)
+
+$(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\src\generic\calctrl.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_dcbuffer.obj :  .AUTODEPEND ..\src\generic\dcbuffer.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_grid.obj :  .AUTODEPEND ..\src\generic\grid.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_gridctrl.obj :  .AUTODEPEND ..\src\generic\gridctrl.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_gridsel.obj :  .AUTODEPEND ..\src\generic\gridsel.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_helpext.obj :  .AUTODEPEND ..\src\generic\helpext.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\src\msw\joystick.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_laywin.obj :  .AUTODEPEND ..\src\generic\laywin.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\src\generic\sashwin.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\src\generic\splash.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_taskbar.obj :  .AUTODEPEND ..\src\msw\taskbar.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_taskbarcmn.obj :  .AUTODEPEND ..\src\common\taskbarcmn.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\src\generic\tipdlg.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_wave.obj :  .AUTODEPEND ..\src\msw\wave.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\src\generic\wizard.cpp
+	$(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\src\generic\calctrl.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_dcbuffer.obj :  .AUTODEPEND ..\src\generic\dcbuffer.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_grid.obj :  .AUTODEPEND ..\src\generic\grid.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_gridctrl.obj :  .AUTODEPEND ..\src\generic\gridctrl.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_gridsel.obj :  .AUTODEPEND ..\src\generic\gridsel.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_helpext.obj :  .AUTODEPEND ..\src\generic\helpext.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_joystick.obj :  .AUTODEPEND ..\src\msw\joystick.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_laywin.obj :  .AUTODEPEND ..\src\generic\laywin.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\src\generic\sashwin.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\src\generic\splash.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_taskbar.obj :  .AUTODEPEND ..\src\msw\taskbar.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_taskbarcmn.obj :  .AUTODEPEND ..\src\common\taskbarcmn.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\src\generic\tipdlg.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_wave.obj :  .AUTODEPEND ..\src\msw\wave.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\src\generic\wizard.cpp
+	$(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -2664,12 +2841,6 @@ $(OBJS)\basedll_datetime.obj :  .AUTODEPEND ..\src\common\datetime.cpp
 $(OBJS)\basedll_datstrm.obj :  .AUTODEPEND ..\src\common\datstrm.cpp
 	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
-$(OBJS)\basedll_db.obj :  .AUTODEPEND ..\src\common\db.cpp
-	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_dbtable.obj :  .AUTODEPEND ..\src\common\dbtable.cpp
-	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
 $(OBJS)\basedll_dde.obj :  .AUTODEPEND ..\src\msw\dde.cpp
 	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -2877,12 +3048,6 @@ $(OBJS)\baselib_datetime.obj :  .AUTODEPEND ..\src\common\datetime.cpp
 $(OBJS)\baselib_datstrm.obj :  .AUTODEPEND ..\src\common\datstrm.cpp
 	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
-$(OBJS)\baselib_db.obj :  .AUTODEPEND ..\src\common\db.cpp
-	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_dbtable.obj :  .AUTODEPEND ..\src\common\dbtable.cpp
-	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
 $(OBJS)\baselib_dde.obj :  .AUTODEPEND ..\src\msw\dde.cpp
 	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -3161,11 +3326,6 @@ $(OBJS)\coredll_button.obj :  .AUTODEPEND ..\src\msw\button.cpp
 !endif
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_calctrl.obj :  .AUTODEPEND ..\src\generic\calctrl.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_caret.obj :  .AUTODEPEND ..\src\msw\caret.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -3300,6 +3460,9 @@ $(OBJS)\coredll_ctrlcmn.obj :  .AUTODEPEND ..\src\common\ctrlcmn.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+$(OBJS)\coredll_ctrlrend.obj :  .AUTODEPEND ..\src\univ\ctrlrend.cpp
+	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_ctrlsub.obj :  .AUTODEPEND ..\src\common\ctrlsub.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -3325,11 +3488,6 @@ $(OBJS)\coredll_dataobj.obj :  .AUTODEPEND ..\src\msw\ole\dataobj.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_dbgrid.obj :  .AUTODEPEND ..\src\common\dbgrid.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_dc.obj :  .AUTODEPEND ..\src\msw\dc.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -3340,11 +3498,6 @@ $(OBJS)\coredll_dcbase.obj :  .AUTODEPEND ..\src\common\dcbase.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_dcbuffer.obj :  .AUTODEPEND ..\src\generic\dcbuffer.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_dcclient.obj :  .AUTODEPEND ..\src\msw\dcclient.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -3597,21 +3750,6 @@ $(OBJS)\coredll_gifdecod.obj :  .AUTODEPEND ..\src\common\gifdecod.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_grid.obj :  .AUTODEPEND ..\src\generic\grid.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_gridctrl.obj :  .AUTODEPEND ..\src\generic\gridctrl.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_gridsel.obj :  .AUTODEPEND ..\src\generic\gridsel.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 $(OBJS)\coredll_gtk.obj :  .AUTODEPEND ..\src\univ\themes\gtk.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -3625,11 +3763,6 @@ $(OBJS)\coredll_helpchm.obj :  .AUTODEPEND ..\src\msw\helpchm.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_helpext.obj :  .AUTODEPEND ..\src\generic\helpext.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_helpwin.obj :  .AUTODEPEND ..\src\msw\helpwin.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -3728,21 +3861,11 @@ $(OBJS)\coredll_inpcons.obj :  .AUTODEPEND ..\src\univ\inpcons.cpp
 $(OBJS)\coredll_inphand.obj :  .AUTODEPEND ..\src\univ\inphand.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_joystick.obj :  .AUTODEPEND ..\src\msw\joystick.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_layout.obj :  .AUTODEPEND ..\src\common\layout.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_laywin.obj :  .AUTODEPEND ..\src\generic\laywin.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_lboxcmn.obj :  .AUTODEPEND ..\src\common\lboxcmn.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -3966,28 +4089,19 @@ $(OBJS)\coredll_radiocmn.obj :  .AUTODEPEND ..\src\common\radiocmn.cpp
 !endif
 
 !ifeq USE_GUI 1
-$(OBJS)\coredll_region.obj :  .AUTODEPEND ..\src\msw\region.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_rendcmn.obj :  .AUTODEPEND ..\src\common\rendcmn.cpp
+$(OBJS)\coredll_region.obj :  .AUTODEPEND ..\src\msw\region.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
-!ifeq WXUNIV 1
-$(OBJS)\coredll_renderer.obj :  .AUTODEPEND ..\src\univ\renderer.cpp
+$(OBJS)\coredll_rendcmn.obj :  .AUTODEPEND ..\src\common\rendcmn.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
-!endif
 
 !ifeq USE_GUI 1
-!ifeq WXUNIV 0
 $(OBJS)\coredll_renderer.obj :  .AUTODEPEND ..\src\msw\renderer.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\coredll_renderg.obj :  .AUTODEPEND ..\src\generic\renderg.cpp
@@ -3999,11 +4113,6 @@ $(OBJS)\coredll_rgncmn.obj :  .AUTODEPEND ..\src\common\rgncmn.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_sashwin.obj :  .AUTODEPEND ..\src\generic\sashwin.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 $(OBJS)\coredll_scrarrow.obj :  .AUTODEPEND ..\src\univ\scrarrow.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -4077,11 +4186,6 @@ $(OBJS)\coredll_spinctlg.obj :  .AUTODEPEND ..\src\generic\spinctlg.cpp
 $(OBJS)\coredll_spinctrl.obj :  .AUTODEPEND ..\src\msw\spinctrl.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_splash.obj :  .AUTODEPEND ..\src\generic\splash.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_splitter.obj :  .AUTODEPEND ..\src\generic\splitter.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -4171,16 +4275,6 @@ $(OBJS)\coredll_tabctrl.obj :  .AUTODEPEND ..\src\msw\tabctrl.cpp
 $(OBJS)\coredll_tabg.obj :  .AUTODEPEND ..\src\generic\tabg.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_taskbar.obj :  .AUTODEPEND ..\src\msw\taskbar.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_taskbarcmn.obj :  .AUTODEPEND ..\src\common\taskbarcmn.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 $(OBJS)\coredll_tbar95.obj :  .AUTODEPEND ..\src\msw\tbar95.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -4234,11 +4328,6 @@ $(OBJS)\coredll_timercmn.obj :  .AUTODEPEND ..\src\common\timercmn.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_tipdlg.obj :  .AUTODEPEND ..\src\generic\tipdlg.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_tipwin.obj :  .AUTODEPEND ..\src\generic\tipwin.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -4291,8 +4380,10 @@ $(OBJS)\coredll_uuid.obj :  .AUTODEPEND ..\src\msw\ole\uuid.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
 $(OBJS)\coredll_uxtheme.obj :  .AUTODEPEND ..\src\msw\uxtheme.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\coredll_valgen.obj :  .AUTODEPEND ..\src\common\valgen.cpp
@@ -4322,11 +4413,6 @@ $(OBJS)\coredll_vscroll.obj :  .AUTODEPEND ..\src\generic\vscroll.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_wave.obj :  .AUTODEPEND ..\src\msw\wave.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 $(OBJS)\coredll_win32.obj :  .AUTODEPEND ..\src\univ\themes\win32.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -4343,11 +4429,6 @@ $(OBJS)\coredll_window.obj :  .AUTODEPEND ..\src\msw\window.cpp
 $(OBJS)\coredll_winuniv.obj :  .AUTODEPEND ..\src\univ\winuniv.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_wizard.obj :  .AUTODEPEND ..\src\generic\wizard.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_xpmdecod.obj :  .AUTODEPEND ..\src\common\xpmdecod.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -4448,11 +4529,6 @@ $(OBJS)\corelib_button.obj :  .AUTODEPEND ..\src\msw\button.cpp
 !endif
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_calctrl.obj :  .AUTODEPEND ..\src\generic\calctrl.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_caret.obj :  .AUTODEPEND ..\src\msw\caret.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -4587,6 +4663,9 @@ $(OBJS)\corelib_ctrlcmn.obj :  .AUTODEPEND ..\src\common\ctrlcmn.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+$(OBJS)\corelib_ctrlrend.obj :  .AUTODEPEND ..\src\univ\ctrlrend.cpp
+	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_ctrlsub.obj :  .AUTODEPEND ..\src\common\ctrlsub.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -4612,11 +4691,6 @@ $(OBJS)\corelib_dataobj.obj :  .AUTODEPEND ..\src\msw\ole\dataobj.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_dbgrid.obj :  .AUTODEPEND ..\src\common\dbgrid.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_dc.obj :  .AUTODEPEND ..\src\msw\dc.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -4627,11 +4701,6 @@ $(OBJS)\corelib_dcbase.obj :  .AUTODEPEND ..\src\common\dcbase.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_dcbuffer.obj :  .AUTODEPEND ..\src\generic\dcbuffer.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_dcclient.obj :  .AUTODEPEND ..\src\msw\dcclient.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -4884,21 +4953,6 @@ $(OBJS)\corelib_gifdecod.obj :  .AUTODEPEND ..\src\common\gifdecod.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_grid.obj :  .AUTODEPEND ..\src\generic\grid.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_gridctrl.obj :  .AUTODEPEND ..\src\generic\gridctrl.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_gridsel.obj :  .AUTODEPEND ..\src\generic\gridsel.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 $(OBJS)\corelib_gtk.obj :  .AUTODEPEND ..\src\univ\themes\gtk.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
@@ -4912,11 +4966,6 @@ $(OBJS)\corelib_helpchm.obj :  .AUTODEPEND ..\src\msw\helpchm.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_helpext.obj :  .AUTODEPEND ..\src\generic\helpext.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_helpwin.obj :  .AUTODEPEND ..\src\msw\helpwin.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -5015,21 +5064,11 @@ $(OBJS)\corelib_inpcons.obj :  .AUTODEPEND ..\src\univ\inpcons.cpp
 $(OBJS)\corelib_inphand.obj :  .AUTODEPEND ..\src\univ\inphand.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_joystick.obj :  .AUTODEPEND ..\src\msw\joystick.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_layout.obj :  .AUTODEPEND ..\src\common\layout.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_laywin.obj :  .AUTODEPEND ..\src\generic\laywin.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_lboxcmn.obj :  .AUTODEPEND ..\src\common\lboxcmn.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -5263,18 +5302,9 @@ $(OBJS)\corelib_rendcmn.obj :  .AUTODEPEND ..\src\common\rendcmn.cpp
 !endif
 
 !ifeq USE_GUI 1
-!ifeq WXUNIV 1
-$(OBJS)\corelib_renderer.obj :  .AUTODEPEND ..\src\univ\renderer.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-!endif
-
-!ifeq USE_GUI 1
-!ifeq WXUNIV 0
 $(OBJS)\corelib_renderer.obj :  .AUTODEPEND ..\src\msw\renderer.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\corelib_renderg.obj :  .AUTODEPEND ..\src\generic\renderg.cpp
@@ -5286,11 +5316,6 @@ $(OBJS)\corelib_rgncmn.obj :  .AUTODEPEND ..\src\common\rgncmn.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_sashwin.obj :  .AUTODEPEND ..\src\generic\sashwin.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 $(OBJS)\corelib_scrarrow.obj :  .AUTODEPEND ..\src\univ\scrarrow.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
@@ -5364,11 +5389,6 @@ $(OBJS)\corelib_spinctlg.obj :  .AUTODEPEND ..\src\generic\spinctlg.cpp
 $(OBJS)\corelib_spinctrl.obj :  .AUTODEPEND ..\src\msw\spinctrl.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_splash.obj :  .AUTODEPEND ..\src\generic\splash.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_splitter.obj :  .AUTODEPEND ..\src\generic\splitter.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -5458,16 +5478,6 @@ $(OBJS)\corelib_tabctrl.obj :  .AUTODEPEND ..\src\msw\tabctrl.cpp
 $(OBJS)\corelib_tabg.obj :  .AUTODEPEND ..\src\generic\tabg.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_taskbar.obj :  .AUTODEPEND ..\src\msw\taskbar.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_taskbarcmn.obj :  .AUTODEPEND ..\src\common\taskbarcmn.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 $(OBJS)\corelib_tbar95.obj :  .AUTODEPEND ..\src\msw\tbar95.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
@@ -5521,11 +5531,6 @@ $(OBJS)\corelib_timercmn.obj :  .AUTODEPEND ..\src\common\timercmn.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_tipdlg.obj :  .AUTODEPEND ..\src\generic\tipdlg.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_tipwin.obj :  .AUTODEPEND ..\src\generic\tipwin.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -5578,8 +5583,10 @@ $(OBJS)\corelib_uuid.obj :  .AUTODEPEND ..\src\msw\ole\uuid.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
 $(OBJS)\corelib_uxtheme.obj :  .AUTODEPEND ..\src\msw\uxtheme.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\corelib_valgen.obj :  .AUTODEPEND ..\src\common\valgen.cpp
@@ -5609,11 +5616,6 @@ $(OBJS)\corelib_vscroll.obj :  .AUTODEPEND ..\src\generic\vscroll.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_wave.obj :  .AUTODEPEND ..\src\msw\wave.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 $(OBJS)\corelib_win32.obj :  .AUTODEPEND ..\src\univ\themes\win32.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
@@ -5630,16 +5632,23 @@ $(OBJS)\corelib_window.obj :  .AUTODEPEND ..\src\msw\window.cpp
 $(OBJS)\corelib_winuniv.obj :  .AUTODEPEND ..\src\univ\winuniv.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_wizard.obj :  .AUTODEPEND ..\src\generic\wizard.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_xpmdecod.obj :  .AUTODEPEND ..\src\common\xpmdecod.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+$(OBJS)\dbgriddll_dbgrid.obj :  .AUTODEPEND ..\src\common\dbgrid.cpp
+	$(CXX) -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
+
+$(OBJS)\dbgriddll_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
+	$(CXX) -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
+
+$(OBJS)\dbgridlib_dbgrid.obj :  .AUTODEPEND ..\src\common\dbgrid.cpp
+	$(CXX) -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
+
+$(OBJS)\dbgridlib_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
+	$(CXX) -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
+
 $(OBJS)\gldll_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
 	$(CXX) -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
 
@@ -5891,10 +5900,8 @@ $(OBJS)\monodll_button.obj :  .AUTODEPEND ..\src\msw\button.cpp
 !endif
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\src\generic\calctrl.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_caret.obj :  .AUTODEPEND ..\src\msw\caret.cpp
@@ -6042,6 +6049,9 @@ $(OBJS)\monodll_ctrlcmn.obj :  .AUTODEPEND ..\src\common\ctrlcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+$(OBJS)\monodll_ctrlrend.obj :  .AUTODEPEND ..\src\univ\ctrlrend.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_ctrlsub.obj :  .AUTODEPEND ..\src\common\ctrlsub.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6076,10 +6086,8 @@ $(OBJS)\monodll_datstrm.obj :  .AUTODEPEND ..\src\common\datstrm.cpp
 $(OBJS)\monodll_db.obj :  .AUTODEPEND ..\src\common\db.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_dbgrid.obj :  .AUTODEPEND ..\src\common\dbgrid.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monodll_dbtable.obj :  .AUTODEPEND ..\src\common\dbtable.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6094,10 +6102,8 @@ $(OBJS)\monodll_dcbase.obj :  .AUTODEPEND ..\src\common\dcbase.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_dcbuffer.obj :  .AUTODEPEND ..\src\generic\dcbuffer.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_dcclient.obj :  .AUTODEPEND ..\src\msw\dcclient.cpp
@@ -6405,20 +6411,14 @@ $(OBJS)\monodll_gifdecod.obj :  .AUTODEPEND ..\src\common\gifdecod.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_grid.obj :  .AUTODEPEND ..\src\generic\grid.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_gridctrl.obj :  .AUTODEPEND ..\src\generic\gridctrl.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_gridsel.obj :  .AUTODEPEND ..\src\generic\gridsel.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monodll_gsocket.obj :  .AUTODEPEND ..\src\msw\gsocket.c
 	$(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $<
@@ -6454,10 +6454,8 @@ $(OBJS)\monodll_helpctrl.obj :  .AUTODEPEND ..\src\html\helpctrl.cpp
 $(OBJS)\monodll_helpdata.obj :  .AUTODEPEND ..\src\html\helpdata.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_helpext.obj :  .AUTODEPEND ..\src\generic\helpext.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monodll_helpfrm.obj :  .AUTODEPEND ..\src\html\helpfrm.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6593,20 +6591,16 @@ $(OBJS)\monodll_intl.obj :  .AUTODEPEND ..\src\common\intl.cpp
 $(OBJS)\monodll_ipcbase.obj :  .AUTODEPEND ..\src\common\ipcbase.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_joystick.obj :  .AUTODEPEND ..\src\msw\joystick.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_layout.obj :  .AUTODEPEND ..\src\common\layout.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_laywin.obj :  .AUTODEPEND ..\src\generic\laywin.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_lboxcmn.obj :  .AUTODEPEND ..\src\common\lboxcmn.cpp
@@ -6913,18 +6907,9 @@ $(OBJS)\monodll_rendcmn.obj :  .AUTODEPEND ..\src\common\rendcmn.cpp
 !endif
 
 !ifeq USE_GUI 1
-!ifeq WXUNIV 1
-$(OBJS)\monodll_renderer.obj :  .AUTODEPEND ..\src\univ\renderer.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-!endif
-
-!ifeq USE_GUI 1
-!ifeq WXUNIV 0
 $(OBJS)\monodll_renderer.obj :  .AUTODEPEND ..\src\msw\renderer.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_renderg.obj :  .AUTODEPEND ..\src\generic\renderg.cpp
@@ -6936,10 +6921,8 @@ $(OBJS)\monodll_rgncmn.obj :  .AUTODEPEND ..\src\common\rgncmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\src\generic\sashwin.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monodll_sckaddr.obj :  .AUTODEPEND ..\src\common\sckaddr.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7032,10 +7015,8 @@ $(OBJS)\monodll_spinctlg.obj :  .AUTODEPEND ..\src\generic\spinctlg.cpp
 $(OBJS)\monodll_spinctrl.obj :  .AUTODEPEND ..\src\msw\spinctrl.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\src\generic\splash.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_splitter.obj :  .AUTODEPEND ..\src\generic\splitter.cpp
@@ -7141,15 +7122,11 @@ $(OBJS)\monodll_tabctrl.obj :  .AUTODEPEND ..\src\msw\tabctrl.cpp
 $(OBJS)\monodll_tabg.obj :  .AUTODEPEND ..\src\generic\tabg.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\src\msw\taskbar.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_taskbarcmn.obj :  .AUTODEPEND ..\src\common\taskbarcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monodll_tbar95.obj :  .AUTODEPEND ..\src\msw\tbar95.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7213,10 +7190,8 @@ $(OBJS)\monodll_timercmn.obj :  .AUTODEPEND ..\src\common\timercmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\src\generic\tipdlg.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_tipwin.obj :  .AUTODEPEND ..\src\generic\tipwin.cpp
@@ -7288,8 +7263,10 @@ $(OBJS)\monodll_uuid.obj :  .AUTODEPEND ..\src\msw\ole\uuid.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
 $(OBJS)\monodll_uxtheme.obj :  .AUTODEPEND ..\src\msw\uxtheme.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_valgen.obj :  .AUTODEPEND ..\src\common\valgen.cpp
@@ -7322,10 +7299,8 @@ $(OBJS)\monodll_vscroll.obj :  .AUTODEPEND ..\src\generic\vscroll.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_wave.obj :  .AUTODEPEND ..\src\msw\wave.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monodll_wfstream.obj :  .AUTODEPEND ..\src\common\wfstream.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7349,10 +7324,8 @@ $(OBJS)\monodll_winpars.obj :  .AUTODEPEND ..\src\html\winpars.cpp
 $(OBJS)\monodll_winuniv.obj :  .AUTODEPEND ..\src\univ\winuniv.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monodll_wizard.obj :  .AUTODEPEND ..\src\generic\wizard.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monodll_wxchar.obj :  .AUTODEPEND ..\src\common\wxchar.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7472,10 +7445,8 @@ $(OBJS)\monolib_button.obj :  .AUTODEPEND ..\src\msw\button.cpp
 !endif
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\src\generic\calctrl.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_caret.obj :  .AUTODEPEND ..\src\msw\caret.cpp
@@ -7623,6 +7594,9 @@ $(OBJS)\monolib_ctrlcmn.obj :  .AUTODEPEND ..\src\common\ctrlcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+$(OBJS)\monolib_ctrlrend.obj :  .AUTODEPEND ..\src\univ\ctrlrend.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_ctrlsub.obj :  .AUTODEPEND ..\src\common\ctrlsub.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7657,10 +7631,8 @@ $(OBJS)\monolib_datstrm.obj :  .AUTODEPEND ..\src\common\datstrm.cpp
 $(OBJS)\monolib_db.obj :  .AUTODEPEND ..\src\common\db.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_dbgrid.obj :  .AUTODEPEND ..\src\common\dbgrid.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monolib_dbtable.obj :  .AUTODEPEND ..\src\common\dbtable.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7675,10 +7647,8 @@ $(OBJS)\monolib_dcbase.obj :  .AUTODEPEND ..\src\common\dcbase.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_dcbuffer.obj :  .AUTODEPEND ..\src\generic\dcbuffer.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_dcclient.obj :  .AUTODEPEND ..\src\msw\dcclient.cpp
@@ -7986,20 +7956,14 @@ $(OBJS)\monolib_gifdecod.obj :  .AUTODEPEND ..\src\common\gifdecod.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_grid.obj :  .AUTODEPEND ..\src\generic\grid.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_gridctrl.obj :  .AUTODEPEND ..\src\generic\gridctrl.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_gridsel.obj :  .AUTODEPEND ..\src\generic\gridsel.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monolib_gsocket.obj :  .AUTODEPEND ..\src\msw\gsocket.c
 	$(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $<
@@ -8035,10 +7999,8 @@ $(OBJS)\monolib_helpctrl.obj :  .AUTODEPEND ..\src\html\helpctrl.cpp
 $(OBJS)\monolib_helpdata.obj :  .AUTODEPEND ..\src\html\helpdata.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_helpext.obj :  .AUTODEPEND ..\src\generic\helpext.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monolib_helpfrm.obj :  .AUTODEPEND ..\src\html\helpfrm.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8174,20 +8136,16 @@ $(OBJS)\monolib_intl.obj :  .AUTODEPEND ..\src\common\intl.cpp
 $(OBJS)\monolib_ipcbase.obj :  .AUTODEPEND ..\src\common\ipcbase.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_joystick.obj :  .AUTODEPEND ..\src\msw\joystick.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_layout.obj :  .AUTODEPEND ..\src\common\layout.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_laywin.obj :  .AUTODEPEND ..\src\generic\laywin.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_lboxcmn.obj :  .AUTODEPEND ..\src\common\lboxcmn.cpp
@@ -8494,18 +8452,9 @@ $(OBJS)\monolib_rendcmn.obj :  .AUTODEPEND ..\src\common\rendcmn.cpp
 !endif
 
 !ifeq USE_GUI 1
-!ifeq WXUNIV 1
-$(OBJS)\monolib_renderer.obj :  .AUTODEPEND ..\src\univ\renderer.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-!endif
-
-!ifeq USE_GUI 1
-!ifeq WXUNIV 0
 $(OBJS)\monolib_renderer.obj :  .AUTODEPEND ..\src\msw\renderer.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_renderg.obj :  .AUTODEPEND ..\src\generic\renderg.cpp
@@ -8517,10 +8466,8 @@ $(OBJS)\monolib_rgncmn.obj :  .AUTODEPEND ..\src\common\rgncmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\src\generic\sashwin.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monolib_sckaddr.obj :  .AUTODEPEND ..\src\common\sckaddr.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8613,10 +8560,8 @@ $(OBJS)\monolib_spinctlg.obj :  .AUTODEPEND ..\src\generic\spinctlg.cpp
 $(OBJS)\monolib_spinctrl.obj :  .AUTODEPEND ..\src\msw\spinctrl.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\src\generic\splash.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_splitter.obj :  .AUTODEPEND ..\src\generic\splitter.cpp
@@ -8722,15 +8667,11 @@ $(OBJS)\monolib_tabctrl.obj :  .AUTODEPEND ..\src\msw\tabctrl.cpp
 $(OBJS)\monolib_tabg.obj :  .AUTODEPEND ..\src\generic\tabg.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\src\msw\taskbar.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_taskbarcmn.obj :  .AUTODEPEND ..\src\common\taskbarcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monolib_tbar95.obj :  .AUTODEPEND ..\src\msw\tbar95.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8794,10 +8735,8 @@ $(OBJS)\monolib_timercmn.obj :  .AUTODEPEND ..\src\common\timercmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\src\generic\tipdlg.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_tipwin.obj :  .AUTODEPEND ..\src\generic\tipwin.cpp
@@ -8869,8 +8808,10 @@ $(OBJS)\monolib_uuid.obj :  .AUTODEPEND ..\src\msw\ole\uuid.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
 $(OBJS)\monolib_uxtheme.obj :  .AUTODEPEND ..\src\msw\uxtheme.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_valgen.obj :  .AUTODEPEND ..\src\common\valgen.cpp
@@ -8903,10 +8844,8 @@ $(OBJS)\monolib_vscroll.obj :  .AUTODEPEND ..\src\generic\vscroll.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_wave.obj :  .AUTODEPEND ..\src\msw\wave.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monolib_wfstream.obj :  .AUTODEPEND ..\src\common\wfstream.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8930,10 +8869,8 @@ $(OBJS)\monolib_winpars.obj :  .AUTODEPEND ..\src\html\winpars.cpp
 $(OBJS)\monolib_winuniv.obj :  .AUTODEPEND ..\src\univ\winuniv.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-!ifeq USE_GUI 1
 $(OBJS)\monolib_wizard.obj :  .AUTODEPEND ..\src\generic\wizard.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
 
 $(OBJS)\monolib_wxchar.obj :  .AUTODEPEND ..\src\common\wxchar.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -9030,6 +8967,24 @@ $(OBJS)\netlib_socket.obj :  .AUTODEPEND ..\src\common\socket.cpp
 $(OBJS)\netlib_url.obj :  .AUTODEPEND ..\src\common\url.cpp
 	$(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
 
+$(OBJS)\odbcdll_db.obj :  .AUTODEPEND ..\src\common\db.cpp
+	$(CXX) -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
+
+$(OBJS)\odbcdll_dbtable.obj :  .AUTODEPEND ..\src\common\dbtable.cpp
+	$(CXX) -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
+
+$(OBJS)\odbcdll_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
+	$(CXX) -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
+
+$(OBJS)\odbclib_db.obj :  .AUTODEPEND ..\src\common\db.cpp
+	$(CXX) -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
+
+$(OBJS)\odbclib_dbtable.obj :  .AUTODEPEND ..\src\common\dbtable.cpp
+	$(CXX) -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
+
+$(OBJS)\odbclib_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
+	$(CXX) -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
+
 $(OBJS)\wxexpat_xmlparse.obj :  .AUTODEPEND ..\src\expat\lib\xmlparse.c
 	$(CC) -zq -fo=$^@ $(WXEXPAT_CFLAGS) $<
 
@@ -9393,6 +9348,36 @@ $(OBJS)\xmllib_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
 $(OBJS)\xmllib_xml.obj :  .AUTODEPEND ..\src\xml\xml.cpp
 	$(CXX) -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $<
 
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll :  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
+	@%create $(OBJS)\advdll.lbc
+	@%append $(OBJS)\advdll.lbc option quiet
+	@%append $(OBJS)\advdll.lbc name $^@
+	@%append $(OBJS)\advdll.lbc option incremental
+	@%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
+	@for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
+	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i
+	@%append $(OBJS)\advdll.lbc
+	@%append $(OBJS)\advdll.lbc system nt_dll
+	wlink @$(OBJS)\advdll.lbc
+	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +$^@
+!endif
+!endif
+!endif
+
+!ifeq MONOLITHIC 0
+!ifeq SHARED 0
+!ifeq USE_GUI 1
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib :  $(ADVLIB_OBJECTS)
+	@%create $(OBJS)\advlib.lbc
+	@for %i in ($(ADVLIB_OBJECTS)) do @%append $(OBJS)\advlib.lbc +%i
+	wlib -q -p2048 -n -b $^@ @$(OBJS)\advlib.lbc
+!endif
+!endif
+!endif
+
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll :  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
@@ -9400,7 +9385,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll :  $(B
 	@%append $(OBJS)\basedll.lbc option quiet
 	@%append $(OBJS)\basedll.lbc name $^@
 	@%append $(OBJS)\basedll.lbc option incremental
-	@%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+	@%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
 	@for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
 	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i
 	@%append $(OBJS)\basedll.lbc
@@ -9442,6 +9427,15 @@ clean : .SYMBOLIC
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+	-if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+	-if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
@@ -9460,7 +9454,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w
 	@%append $(OBJS)\coredll.lbc option quiet
 	@%append $(OBJS)\coredll.lbc name $^@
 	@%append $(OBJS)\coredll.lbc option incremental
-	@%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+	@%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
 	@for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
 	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i
 	@%append $(OBJS)\coredll.lbc
@@ -9482,6 +9476,40 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
 !endif
 !endif
 
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll :  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
+	@%create $(OBJS)\dbgriddll.lbc
+	@%append $(OBJS)\dbgriddll.lbc option quiet
+	@%append $(OBJS)\dbgriddll.lbc name $^@
+	@%append $(OBJS)\dbgriddll.lbc option incremental
+	@%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
+	@for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i
+	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
+	@%append $(OBJS)\dbgriddll.lbc
+	@%append $(OBJS)\dbgriddll.lbc system nt_dll
+	wlink @$(OBJS)\dbgriddll.lbc
+	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib +$^@
+!endif
+!endif
+!endif
+!endif
+
+!ifeq MONOLITHIC 0
+!ifeq SHARED 0
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib :  $(DBGRIDLIB_OBJECTS)
+	@%create $(OBJS)\dbgridlib.lbc
+	@for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i
+	wlib -q -p2048 -n -b $^@ @$(OBJS)\dbgridlib.lbc
+!endif
+!endif
+!endif
+!endif
+
 !ifeq SHARED 1
 !ifeq USE_GUI 1
 !ifeq USE_OPENGL 1
@@ -9490,7 +9518,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat
 	@%append $(OBJS)\gldll.lbc option quiet
 	@%append $(OBJS)\gldll.lbc name $^@
 	@%append $(OBJS)\gldll.lbc option incremental
-	@%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+	@%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
 	@for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
 	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
 	@%append $(OBJS)\gldll.lbc
@@ -9520,7 +9548,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w
 	@%append $(OBJS)\htmldll.lbc option quiet
 	@%append $(OBJS)\htmldll.lbc name $^@
 	@%append $(OBJS)\htmldll.lbc option incremental
-	@%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+	@%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
 	@for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
 	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i
 	@%append $(OBJS)\htmldll.lbc
@@ -9555,9 +9583,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V
 	@%append $(OBJS)\monodll.lbc option quiet
 	@%append $(OBJS)\monodll.lbc name $^@
 	@%append $(OBJS)\monodll.lbc option incremental
-	@%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+	@%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
 	@for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
-	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  ) do @%append $(OBJS)\monodll.lbc library %i
+	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib   ) do @%append $(OBJS)\monodll.lbc library %i
 	@%append $(OBJS)\monodll.lbc
 	@%append $(OBJS)\monodll.lbc system nt_dll
 	wlink @$(OBJS)\monodll.lbc
@@ -9584,7 +9612,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll :
 	@%append $(OBJS)\netdll.lbc option quiet
 	@%append $(OBJS)\netdll.lbc name $^@
 	@%append $(OBJS)\netdll.lbc option incremental
-	@%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+	@%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
 	@for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
 	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i
 	@%append $(OBJS)\netdll.lbc
@@ -9603,6 +9631,40 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib :  $(NETLIB_OBJECTS
 !endif
 !endif
 
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll :  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
+	@%create $(OBJS)\odbcdll.lbc
+	@%append $(OBJS)\odbcdll.lbc option quiet
+	@%append $(OBJS)\odbcdll.lbc name $^@
+	@%append $(OBJS)\odbcdll.lbc option incremental
+	@%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
+	@for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
+	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
+	@%append $(OBJS)\odbcdll.lbc
+	@%append $(OBJS)\odbcdll.lbc system nt_dll
+	wlink @$(OBJS)\odbcdll.lbc
+	wlib -q -n -b $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib +$^@
+!endif
+!endif
+!endif
+!endif
+
+!ifeq MONOLITHIC 0
+!ifeq SHARED 0
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib :  $(ODBCLIB_OBJECTS)
+	@%create $(OBJS)\odbclib.lbc
+	@for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i
+	wlib -q -p2048 -n -b $^@ @$(OBJS)\odbclib.lbc
+!endif
+!endif
+!endif
+!endif
+
 $(LIBDIRNAME)\wx\setup.h :  
 	if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
 
@@ -9651,7 +9713,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll :
 	@%append $(OBJS)\xmldll.lbc option quiet
 	@%append $(OBJS)\xmldll.lbc name $^@
 	@%append $(OBJS)\xmldll.lbc option incremental
-	@%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+	@%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
 	@for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
 	@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i
 	@%append $(OBJS)\xmldll.lbc