avoid using _WIN32_IE

[wxWidgets.git] / build / makefile.wat

diff --git a/build/makefile.wat b/build/makefile.wat
index 62863761f121df94a411131bf8987c1290d5db1f..7d3112b23f1569e5fc0f272dd73c5bedf06ca14b 100644 (file)
--- a/build/makefile.wat
+++ b/build/makefile.wat
@@ -43,6 +43,11 @@ VENDORTAG =
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug

+!ifeq DEBUG_FLAG default
+WXDEBUGFLAG = d
+!endif
+!endif
+!ifeq DEBUG_FLAG 1

 WXDEBUGFLAG = d
 !endif
 WXDLLFLAG =
 WXDEBUGFLAG = d
 !endif
 WXDLLFLAG =


@@ -57,22 +62,47 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif

-__DEBUGFLAG =
+__DEBUGINFO =

 !ifeq BUILD debug
 !ifeq BUILD debug

-__DEBUGFLAG = -d2
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d2
+!endif

 !endif
 !ifeq BUILD release
 !endif
 !ifeq BUILD release

-__DEBUGFLAG = -d0
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d0

 !endif
 !endif

-__DEBUGFLAG_5 =
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO = -d2
+!endif
+__DEBUGINFO_9 =

 !ifeq BUILD debug
 !ifeq BUILD debug

-__DEBUGFLAG_5 = debug all
+!ifeq DEBUG_INFO default
+__DEBUGINFO_9 = debug all
+!endif

 !endif
 !ifeq BUILD release
 !endif
 !ifeq BUILD release

-__DEBUGFLAG_5 = 
+!ifeq DEBUG_INFO default
+__DEBUGINFO_9 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_9 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_9 = debug all

 !endif
 __DEBUG_DEFINE_p =
 !ifeq BUILD debug
 !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 =
 __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_helpchm.obj &
        $(OBJS)\monolib_helpwin.obj &
        $(OBJS)\monolib_icon.obj &

-       $(OBJS)\monolib_joystick.obj &

        $(OBJS)\monolib_minifram.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_palette.obj &
        $(OBJS)\monolib_pen.obj &
        $(OBJS)\monolib_popupwin.obj &
        $(OBJS)\monolib_region.obj &

+       $(OBJS)\monolib_renderer.obj &

        $(OBJS)\monolib_settings.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_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_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_statusbr.obj &

-       $(OBJS)\monolib_uxtheme.obj &
-       $(OBJS)\monolib_access.obj &

        $(OBJS)\monolib_accel.obj &
        $(OBJS)\monolib_bmpbuttn.obj &
        $(OBJS)\monolib_button.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_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_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 &
        $(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_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_accesscmn.obj &

+       $(OBJS)\monolib_appcmn.obj &

        $(OBJS)\monolib_artprov.obj &
        $(OBJS)\monolib_artstd.obj &
        $(OBJS)\monolib_bmpbase.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_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 &
        $(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_fddlgcmn.obj &
        $(OBJS)\monolib_fldlgcmn.obj &
        $(OBJS)\monolib_fontcmn.obj &

+       $(OBJS)\monolib_fontmap.obj &

        $(OBJS)\monolib_framecmn.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 &
        $(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_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 &
        $(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_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 &
        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &
        $(OBJS)\monolib_matrix.obj &


@@ -316,18 +308,41 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_prntbase.obj &
        $(OBJS)\monolib_quantize.obj &
        $(OBJS)\monolib_radiocmn.obj &
        $(OBJS)\monolib_prntbase.obj &
        $(OBJS)\monolib_quantize.obj &
        $(OBJS)\monolib_radiocmn.obj &

+       $(OBJS)\monolib_rendcmn.obj &

        $(OBJS)\monolib_rgncmn.obj &
        $(OBJS)\monolib_settcmn.obj &
        $(OBJS)\monolib_sizer.obj &
        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_tbarbase.obj &
        $(OBJS)\monolib_textcmn.obj &
        $(OBJS)\monolib_rgncmn.obj &
        $(OBJS)\monolib_settcmn.obj &
        $(OBJS)\monolib_sizer.obj &
        $(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_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
 !endif
 !endif
 !ifeq USE_GUI 1


@@ -360,28 +375,38 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_helpchm.obj &
        $(OBJS)\monolib_helpwin.obj &
        $(OBJS)\monolib_icon.obj &
        $(OBJS)\monolib_helpchm.obj &
        $(OBJS)\monolib_helpwin.obj &
        $(OBJS)\monolib_icon.obj &

-       $(OBJS)\monolib_joystick.obj &

        $(OBJS)\monolib_minifram.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_palette.obj &
        $(OBJS)\monolib_pen.obj &
        $(OBJS)\monolib_popupwin.obj &
        $(OBJS)\monolib_region.obj &

+       $(OBJS)\monolib_renderer.obj &

        $(OBJS)\monolib_settings.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_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_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_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 &
        $(OBJS)\monolib_bmpbuttn.obj &
        $(OBJS)\monolib_button.obj &
        $(OBJS)\monolib_checkbox.obj &


@@ -390,9 +415,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_colschem.obj &
        $(OBJS)\monolib_combobox.obj &
        $(OBJS)\monolib_control.obj &
        $(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_dialog.obj &
        $(OBJS)\monolib_framuniv.obj &

-       $(OBJS)\monolib_topluniv.obj &

        $(OBJS)\monolib_gauge.obj &
        $(OBJS)\monolib_inpcons.obj &
        $(OBJS)\monolib_inphand.obj &
        $(OBJS)\monolib_gauge.obj &
        $(OBJS)\monolib_inpcons.obj &
        $(OBJS)\monolib_inphand.obj &


@@ -401,7 +426,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_notebook.obj &
        $(OBJS)\monolib_radiobox.obj &
        $(OBJS)\monolib_radiobut.obj &
        $(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 &
        $(OBJS)\monolib_scrarrow.obj &
        $(OBJS)\monolib_scrolbar.obj &
        $(OBJS)\monolib_scrthumb.obj &


@@ -412,58 +436,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_statline.obj &
        $(OBJS)\monolib_stattext.obj &
        $(OBJS)\monolib_statusbr.obj &
        $(OBJS)\monolib_statline.obj &
        $(OBJS)\monolib_stattext.obj &
        $(OBJS)\monolib_statusbr.obj &

-       $(OBJS)\monolib_toolbar.obj &

        $(OBJS)\monolib_theme.obj &
        $(OBJS)\monolib_theme.obj &

+       $(OBJS)\monolib_toolbar.obj &
+       $(OBJS)\monolib_topluniv.obj &

        $(OBJS)\monolib_winuniv.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_gtk.obj &

-       $(OBJS)\monolib_win32.obj &

        $(OBJS)\monolib_metal.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_accesscmn.obj &

+       $(OBJS)\monolib_appcmn.obj &

        $(OBJS)\monolib_artprov.obj &
        $(OBJS)\monolib_artstd.obj &
        $(OBJS)\monolib_bmpbase.obj &
        $(OBJS)\monolib_artprov.obj &
        $(OBJS)\monolib_artstd.obj &
        $(OBJS)\monolib_bmpbase.obj &


@@ -476,7 +457,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_ctrlcmn.obj &
        $(OBJS)\monolib_ctrlsub.obj &
        $(OBJS)\monolib_datacmn.obj &
        $(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 &
        $(OBJS)\monolib_dcbase.obj &
        $(OBJS)\monolib_dlgcmn.obj &
        $(OBJS)\monolib_dndcmn.obj &


@@ -489,9 +469,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_fddlgcmn.obj &
        $(OBJS)\monolib_fldlgcmn.obj &
        $(OBJS)\monolib_fontcmn.obj &
        $(OBJS)\monolib_fddlgcmn.obj &
        $(OBJS)\monolib_fldlgcmn.obj &
        $(OBJS)\monolib_fontcmn.obj &

+       $(OBJS)\monolib_fontmap.obj &

        $(OBJS)\monolib_framecmn.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 &
        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &


@@ -501,6 +480,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_imagall.obj &
        $(OBJS)\monolib_imagbmp.obj &
        $(OBJS)\monolib_image.obj &
        $(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 &
        $(OBJS)\monolib_imaggif.obj &
        $(OBJS)\monolib_imagiff.obj &
        $(OBJS)\monolib_imagjpeg.obj &


@@ -509,7 +489,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_imagpnm.obj &
        $(OBJS)\monolib_imagtiff.obj &
        $(OBJS)\monolib_imagxpm.obj &
        $(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 &
        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &
        $(OBJS)\monolib_matrix.obj &


@@ -520,18 +499,41 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_prntbase.obj &
        $(OBJS)\monolib_quantize.obj &
        $(OBJS)\monolib_radiocmn.obj &
        $(OBJS)\monolib_prntbase.obj &
        $(OBJS)\monolib_quantize.obj &
        $(OBJS)\monolib_radiocmn.obj &

+       $(OBJS)\monolib_rendcmn.obj &

        $(OBJS)\monolib_rgncmn.obj &
        $(OBJS)\monolib_settcmn.obj &
        $(OBJS)\monolib_sizer.obj &
        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_tbarbase.obj &
        $(OBJS)\monolib_textcmn.obj &
        $(OBJS)\monolib_rgncmn.obj &
        $(OBJS)\monolib_settcmn.obj &
        $(OBJS)\monolib_sizer.obj &
        $(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_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 =
 !endif
 !endif
 ____CORE_SRC_FILENAMES_2_OBJECTS =


@@ -565,30 +567,26 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_helpchm.obj &
        $(OBJS)\coredll_helpwin.obj &
        $(OBJS)\coredll_icon.obj &
        $(OBJS)\coredll_helpchm.obj &
        $(OBJS)\coredll_helpwin.obj &
        $(OBJS)\coredll_icon.obj &

-       $(OBJS)\coredll_joystick.obj &

        $(OBJS)\coredll_minifram.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_palette.obj &
        $(OBJS)\coredll_pen.obj &
        $(OBJS)\coredll_popupwin.obj &
        $(OBJS)\coredll_region.obj &

+       $(OBJS)\coredll_renderer.obj &

        $(OBJS)\coredll_settings.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_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_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_statusbr.obj &

-       $(OBJS)\coredll_uxtheme.obj &
-       $(OBJS)\coredll_access.obj &

        $(OBJS)\coredll_accel.obj &
        $(OBJS)\coredll_bmpbuttn.obj &
        $(OBJS)\coredll_button.obj &
        $(OBJS)\coredll_accel.obj &
        $(OBJS)\coredll_bmpbuttn.obj &
        $(OBJS)\coredll_button.obj &


@@ -616,13 +614,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_msgdlg.obj &
        $(OBJS)\coredll_nativdlg.obj &
        $(OBJS)\coredll_notebook.obj &
        $(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_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 &
        $(OBJS)\coredll_scrolbar.obj &
        $(OBJS)\coredll_slider95.obj &
        $(OBJS)\coredll_spinbutt.obj &


@@ -637,40 +635,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_textctrl.obj &
        $(OBJS)\coredll_tglbtn.obj &
        $(OBJS)\coredll_treectrl.obj &
        $(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_accesscmn.obj &

+       $(OBJS)\coredll_appcmn.obj &

        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
        $(OBJS)\coredll_bmpbase.obj &
        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
        $(OBJS)\coredll_bmpbase.obj &


@@ -683,7 +649,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_ctrlcmn.obj &
        $(OBJS)\coredll_ctrlsub.obj &
        $(OBJS)\coredll_datacmn.obj &
        $(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 &
        $(OBJS)\coredll_dcbase.obj &
        $(OBJS)\coredll_dlgcmn.obj &
        $(OBJS)\coredll_dndcmn.obj &


@@ -696,9 +661,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_fddlgcmn.obj &
        $(OBJS)\coredll_fldlgcmn.obj &
        $(OBJS)\coredll_fontcmn.obj &
        $(OBJS)\coredll_fddlgcmn.obj &
        $(OBJS)\coredll_fldlgcmn.obj &
        $(OBJS)\coredll_fontcmn.obj &

+       $(OBJS)\coredll_fontmap.obj &

        $(OBJS)\coredll_framecmn.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 &
        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &


@@ -708,6 +672,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagall.obj &
        $(OBJS)\coredll_imagbmp.obj &
        $(OBJS)\coredll_image.obj &
        $(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 &
        $(OBJS)\coredll_imaggif.obj &
        $(OBJS)\coredll_imagiff.obj &
        $(OBJS)\coredll_imagjpeg.obj &


@@ -716,7 +681,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagpnm.obj &
        $(OBJS)\coredll_imagtiff.obj &
        $(OBJS)\coredll_imagxpm.obj &
        $(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 &
        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &
        $(OBJS)\coredll_matrix.obj &


@@ -727,22 +691,45 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_prntbase.obj &
        $(OBJS)\coredll_quantize.obj &
        $(OBJS)\coredll_radiocmn.obj &
        $(OBJS)\coredll_prntbase.obj &
        $(OBJS)\coredll_quantize.obj &
        $(OBJS)\coredll_radiocmn.obj &

+       $(OBJS)\coredll_rendcmn.obj &

        $(OBJS)\coredll_rgncmn.obj &
        $(OBJS)\coredll_settcmn.obj &
        $(OBJS)\coredll_sizer.obj &
        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_tbarbase.obj &
        $(OBJS)\coredll_textcmn.obj &
        $(OBJS)\coredll_rgncmn.obj &
        $(OBJS)\coredll_settcmn.obj &
        $(OBJS)\coredll_sizer.obj &
        $(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_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
+       $(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 &
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_app.obj &
        $(OBJS)\coredll_bitmap.obj &


@@ -771,28 +758,38 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_helpchm.obj &
        $(OBJS)\coredll_helpwin.obj &
        $(OBJS)\coredll_icon.obj &
        $(OBJS)\coredll_helpchm.obj &
        $(OBJS)\coredll_helpwin.obj &
        $(OBJS)\coredll_icon.obj &

-       $(OBJS)\coredll_joystick.obj &

        $(OBJS)\coredll_minifram.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_palette.obj &
        $(OBJS)\coredll_pen.obj &
        $(OBJS)\coredll_popupwin.obj &
        $(OBJS)\coredll_region.obj &

+       $(OBJS)\coredll_renderer.obj &

        $(OBJS)\coredll_settings.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_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_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_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 &
        $(OBJS)\coredll_bmpbuttn.obj &
        $(OBJS)\coredll_button.obj &
        $(OBJS)\coredll_checkbox.obj &


@@ -801,9 +798,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_colschem.obj &
        $(OBJS)\coredll_combobox.obj &
        $(OBJS)\coredll_control.obj &
        $(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_dialog.obj &
        $(OBJS)\coredll_framuniv.obj &

-       $(OBJS)\coredll_topluniv.obj &

        $(OBJS)\coredll_gauge.obj &
        $(OBJS)\coredll_inpcons.obj &
        $(OBJS)\coredll_inphand.obj &
        $(OBJS)\coredll_gauge.obj &
        $(OBJS)\coredll_inpcons.obj &
        $(OBJS)\coredll_inphand.obj &


@@ -812,7 +809,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_notebook.obj &
        $(OBJS)\coredll_radiobox.obj &
        $(OBJS)\coredll_radiobut.obj &
        $(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 &
        $(OBJS)\coredll_scrarrow.obj &
        $(OBJS)\coredll_scrolbar.obj &
        $(OBJS)\coredll_scrthumb.obj &


@@ -823,58 +819,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_statline.obj &
        $(OBJS)\coredll_stattext.obj &
        $(OBJS)\coredll_statusbr.obj &
        $(OBJS)\coredll_statline.obj &
        $(OBJS)\coredll_stattext.obj &
        $(OBJS)\coredll_statusbr.obj &

-       $(OBJS)\coredll_toolbar.obj &

        $(OBJS)\coredll_theme.obj &
        $(OBJS)\coredll_theme.obj &

+       $(OBJS)\coredll_toolbar.obj &
+       $(OBJS)\coredll_topluniv.obj &

        $(OBJS)\coredll_winuniv.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_gtk.obj &

-       $(OBJS)\coredll_win32.obj &

        $(OBJS)\coredll_metal.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_accesscmn.obj &

+       $(OBJS)\coredll_appcmn.obj &

        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
        $(OBJS)\coredll_bmpbase.obj &
        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
        $(OBJS)\coredll_bmpbase.obj &


@@ -887,7 +840,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_ctrlcmn.obj &
        $(OBJS)\coredll_ctrlsub.obj &
        $(OBJS)\coredll_datacmn.obj &
        $(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 &
        $(OBJS)\coredll_dcbase.obj &
        $(OBJS)\coredll_dlgcmn.obj &
        $(OBJS)\coredll_dndcmn.obj &


@@ -900,9 +852,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_fddlgcmn.obj &
        $(OBJS)\coredll_fldlgcmn.obj &
        $(OBJS)\coredll_fontcmn.obj &
        $(OBJS)\coredll_fddlgcmn.obj &
        $(OBJS)\coredll_fldlgcmn.obj &
        $(OBJS)\coredll_fontcmn.obj &

+       $(OBJS)\coredll_fontmap.obj &

        $(OBJS)\coredll_framecmn.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 &
        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &


@@ -912,6 +863,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagall.obj &
        $(OBJS)\coredll_imagbmp.obj &
        $(OBJS)\coredll_image.obj &
        $(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 &
        $(OBJS)\coredll_imaggif.obj &
        $(OBJS)\coredll_imagiff.obj &
        $(OBJS)\coredll_imagjpeg.obj &


@@ -920,7 +872,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagpnm.obj &
        $(OBJS)\coredll_imagtiff.obj &
        $(OBJS)\coredll_imagxpm.obj &
        $(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 &
        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &
        $(OBJS)\coredll_matrix.obj &


@@ -931,18 +882,41 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_prntbase.obj &
        $(OBJS)\coredll_quantize.obj &
        $(OBJS)\coredll_radiocmn.obj &
        $(OBJS)\coredll_prntbase.obj &
        $(OBJS)\coredll_quantize.obj &
        $(OBJS)\coredll_radiocmn.obj &

+       $(OBJS)\coredll_rendcmn.obj &

        $(OBJS)\coredll_rgncmn.obj &
        $(OBJS)\coredll_settcmn.obj &
        $(OBJS)\coredll_sizer.obj &
        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_tbarbase.obj &
        $(OBJS)\coredll_textcmn.obj &
        $(OBJS)\coredll_rgncmn.obj &
        $(OBJS)\coredll_settcmn.obj &
        $(OBJS)\coredll_sizer.obj &
        $(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_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 =
 !endif
 !endif
 ____CORE_SRC_FILENAMES_3_OBJECTS =


@@ -976,30 +950,26 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_helpchm.obj &
        $(OBJS)\corelib_helpwin.obj &
        $(OBJS)\corelib_icon.obj &
        $(OBJS)\corelib_helpchm.obj &
        $(OBJS)\corelib_helpwin.obj &
        $(OBJS)\corelib_icon.obj &

-       $(OBJS)\corelib_joystick.obj &

        $(OBJS)\corelib_minifram.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_palette.obj &
        $(OBJS)\corelib_pen.obj &
        $(OBJS)\corelib_popupwin.obj &
        $(OBJS)\corelib_region.obj &

+       $(OBJS)\corelib_renderer.obj &

        $(OBJS)\corelib_settings.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_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_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_statusbr.obj &

-       $(OBJS)\corelib_uxtheme.obj &
-       $(OBJS)\corelib_access.obj &

        $(OBJS)\corelib_accel.obj &
        $(OBJS)\corelib_bmpbuttn.obj &
        $(OBJS)\corelib_button.obj &
        $(OBJS)\corelib_accel.obj &
        $(OBJS)\corelib_bmpbuttn.obj &
        $(OBJS)\corelib_button.obj &


@@ -1027,13 +997,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_msgdlg.obj &
        $(OBJS)\corelib_nativdlg.obj &
        $(OBJS)\corelib_notebook.obj &
        $(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_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 &
        $(OBJS)\corelib_scrolbar.obj &
        $(OBJS)\corelib_slider95.obj &
        $(OBJS)\corelib_spinbutt.obj &


@@ -1048,40 +1018,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_textctrl.obj &
        $(OBJS)\corelib_tglbtn.obj &
        $(OBJS)\corelib_treectrl.obj &
        $(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_accesscmn.obj &

+       $(OBJS)\corelib_appcmn.obj &

        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
        $(OBJS)\corelib_bmpbase.obj &
        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
        $(OBJS)\corelib_bmpbase.obj &


@@ -1094,7 +1032,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_ctrlcmn.obj &
        $(OBJS)\corelib_ctrlsub.obj &
        $(OBJS)\corelib_datacmn.obj &
        $(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 &
        $(OBJS)\corelib_dcbase.obj &
        $(OBJS)\corelib_dlgcmn.obj &
        $(OBJS)\corelib_dndcmn.obj &


@@ -1107,9 +1044,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_fddlgcmn.obj &
        $(OBJS)\corelib_fldlgcmn.obj &
        $(OBJS)\corelib_fontcmn.obj &
        $(OBJS)\corelib_fddlgcmn.obj &
        $(OBJS)\corelib_fldlgcmn.obj &
        $(OBJS)\corelib_fontcmn.obj &

+       $(OBJS)\corelib_fontmap.obj &

        $(OBJS)\corelib_framecmn.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 &
        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &


@@ -1119,6 +1055,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagall.obj &
        $(OBJS)\corelib_imagbmp.obj &
        $(OBJS)\corelib_image.obj &
        $(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 &
        $(OBJS)\corelib_imaggif.obj &
        $(OBJS)\corelib_imagiff.obj &
        $(OBJS)\corelib_imagjpeg.obj &


@@ -1127,7 +1064,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagpnm.obj &
        $(OBJS)\corelib_imagtiff.obj &
        $(OBJS)\corelib_imagxpm.obj &
        $(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 &
        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &
        $(OBJS)\corelib_matrix.obj &


@@ -1138,18 +1074,41 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_prntbase.obj &
        $(OBJS)\corelib_quantize.obj &
        $(OBJS)\corelib_radiocmn.obj &
        $(OBJS)\corelib_prntbase.obj &
        $(OBJS)\corelib_quantize.obj &
        $(OBJS)\corelib_radiocmn.obj &

+       $(OBJS)\corelib_rendcmn.obj &

        $(OBJS)\corelib_rgncmn.obj &
        $(OBJS)\corelib_settcmn.obj &
        $(OBJS)\corelib_sizer.obj &
        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_tbarbase.obj &
        $(OBJS)\corelib_textcmn.obj &
        $(OBJS)\corelib_rgncmn.obj &
        $(OBJS)\corelib_settcmn.obj &
        $(OBJS)\corelib_sizer.obj &
        $(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_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
 !endif
 !endif
 !ifeq USE_GUI 1


@@ -1182,28 +1141,38 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_helpchm.obj &
        $(OBJS)\corelib_helpwin.obj &
        $(OBJS)\corelib_icon.obj &
        $(OBJS)\corelib_helpchm.obj &
        $(OBJS)\corelib_helpwin.obj &
        $(OBJS)\corelib_icon.obj &

-       $(OBJS)\corelib_joystick.obj &

        $(OBJS)\corelib_minifram.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_palette.obj &
        $(OBJS)\corelib_pen.obj &
        $(OBJS)\corelib_popupwin.obj &
        $(OBJS)\corelib_region.obj &

+       $(OBJS)\corelib_renderer.obj &

        $(OBJS)\corelib_settings.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_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_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_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 &
        $(OBJS)\corelib_bmpbuttn.obj &
        $(OBJS)\corelib_button.obj &
        $(OBJS)\corelib_checkbox.obj &


@@ -1212,9 +1181,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_colschem.obj &
        $(OBJS)\corelib_combobox.obj &
        $(OBJS)\corelib_control.obj &
        $(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_dialog.obj &
        $(OBJS)\corelib_framuniv.obj &

-       $(OBJS)\corelib_topluniv.obj &

        $(OBJS)\corelib_gauge.obj &
        $(OBJS)\corelib_inpcons.obj &
        $(OBJS)\corelib_inphand.obj &
        $(OBJS)\corelib_gauge.obj &
        $(OBJS)\corelib_inpcons.obj &
        $(OBJS)\corelib_inphand.obj &


@@ -1223,7 +1192,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_notebook.obj &
        $(OBJS)\corelib_radiobox.obj &
        $(OBJS)\corelib_radiobut.obj &
        $(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 &
        $(OBJS)\corelib_scrarrow.obj &
        $(OBJS)\corelib_scrolbar.obj &
        $(OBJS)\corelib_scrthumb.obj &


@@ -1234,58 +1202,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_statline.obj &
        $(OBJS)\corelib_stattext.obj &
        $(OBJS)\corelib_statusbr.obj &
        $(OBJS)\corelib_statline.obj &
        $(OBJS)\corelib_stattext.obj &
        $(OBJS)\corelib_statusbr.obj &

-       $(OBJS)\corelib_toolbar.obj &

        $(OBJS)\corelib_theme.obj &
        $(OBJS)\corelib_theme.obj &

+       $(OBJS)\corelib_toolbar.obj &
+       $(OBJS)\corelib_topluniv.obj &

        $(OBJS)\corelib_winuniv.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_gtk.obj &

-       $(OBJS)\corelib_win32.obj &

        $(OBJS)\corelib_metal.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_accesscmn.obj &

+       $(OBJS)\corelib_appcmn.obj &

        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
        $(OBJS)\corelib_bmpbase.obj &
        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
        $(OBJS)\corelib_bmpbase.obj &


@@ -1298,7 +1223,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_ctrlcmn.obj &
        $(OBJS)\corelib_ctrlsub.obj &
        $(OBJS)\corelib_datacmn.obj &
        $(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 &
        $(OBJS)\corelib_dcbase.obj &
        $(OBJS)\corelib_dlgcmn.obj &
        $(OBJS)\corelib_dndcmn.obj &


@@ -1311,9 +1235,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_fddlgcmn.obj &
        $(OBJS)\corelib_fldlgcmn.obj &
        $(OBJS)\corelib_fontcmn.obj &
        $(OBJS)\corelib_fddlgcmn.obj &
        $(OBJS)\corelib_fldlgcmn.obj &
        $(OBJS)\corelib_fontcmn.obj &

+       $(OBJS)\corelib_fontmap.obj &

        $(OBJS)\corelib_framecmn.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 &
        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &


@@ -1323,6 +1246,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagall.obj &
        $(OBJS)\corelib_imagbmp.obj &
        $(OBJS)\corelib_image.obj &
        $(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 &
        $(OBJS)\corelib_imaggif.obj &
        $(OBJS)\corelib_imagiff.obj &
        $(OBJS)\corelib_imagjpeg.obj &


@@ -1331,7 +1255,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagpnm.obj &
        $(OBJS)\corelib_imagtiff.obj &
        $(OBJS)\corelib_imagxpm.obj &
        $(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 &
        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &
        $(OBJS)\corelib_matrix.obj &


@@ -1342,18 +1265,41 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_prntbase.obj &
        $(OBJS)\corelib_quantize.obj &
        $(OBJS)\corelib_radiocmn.obj &
        $(OBJS)\corelib_prntbase.obj &
        $(OBJS)\corelib_quantize.obj &
        $(OBJS)\corelib_radiocmn.obj &

+       $(OBJS)\corelib_rendcmn.obj &

        $(OBJS)\corelib_rgncmn.obj &
        $(OBJS)\corelib_settcmn.obj &
        $(OBJS)\corelib_sizer.obj &
        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_tbarbase.obj &
        $(OBJS)\corelib_textcmn.obj &
        $(OBJS)\corelib_rgncmn.obj &
        $(OBJS)\corelib_settcmn.obj &
        $(OBJS)\corelib_sizer.obj &
        $(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_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 =
 !endif
 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =


@@ -1387,30 +1333,26 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_helpchm.obj &
        $(OBJS)\monodll_helpwin.obj &
        $(OBJS)\monodll_icon.obj &
        $(OBJS)\monodll_helpchm.obj &
        $(OBJS)\monodll_helpwin.obj &
        $(OBJS)\monodll_icon.obj &

-       $(OBJS)\monodll_joystick.obj &

        $(OBJS)\monodll_minifram.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_palette.obj &
        $(OBJS)\monodll_pen.obj &
        $(OBJS)\monodll_popupwin.obj &
        $(OBJS)\monodll_region.obj &

+       $(OBJS)\monodll_renderer.obj &

        $(OBJS)\monodll_settings.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_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_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_statusbr.obj &

-       $(OBJS)\monodll_uxtheme.obj &
-       $(OBJS)\monodll_access.obj &

        $(OBJS)\monodll_accel.obj &
        $(OBJS)\monodll_bmpbuttn.obj &
        $(OBJS)\monodll_button.obj &
        $(OBJS)\monodll_accel.obj &
        $(OBJS)\monodll_bmpbuttn.obj &
        $(OBJS)\monodll_button.obj &


@@ -1438,13 +1380,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_msgdlg.obj &
        $(OBJS)\monodll_nativdlg.obj &
        $(OBJS)\monodll_notebook.obj &
        $(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_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 &
        $(OBJS)\monodll_scrolbar.obj &
        $(OBJS)\monodll_slider95.obj &
        $(OBJS)\monodll_spinbutt.obj &


@@ -1459,40 +1401,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_textctrl.obj &
        $(OBJS)\monodll_tglbtn.obj &
        $(OBJS)\monodll_treectrl.obj &
        $(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_accesscmn.obj &

+       $(OBJS)\monodll_appcmn.obj &

        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
        $(OBJS)\monodll_bmpbase.obj &
        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
        $(OBJS)\monodll_bmpbase.obj &


@@ -1505,7 +1415,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_ctrlcmn.obj &
        $(OBJS)\monodll_ctrlsub.obj &
        $(OBJS)\monodll_datacmn.obj &
        $(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 &
        $(OBJS)\monodll_dcbase.obj &
        $(OBJS)\monodll_dlgcmn.obj &
        $(OBJS)\monodll_dndcmn.obj &


@@ -1518,9 +1427,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_fddlgcmn.obj &
        $(OBJS)\monodll_fldlgcmn.obj &
        $(OBJS)\monodll_fontcmn.obj &
        $(OBJS)\monodll_fddlgcmn.obj &
        $(OBJS)\monodll_fldlgcmn.obj &
        $(OBJS)\monodll_fontcmn.obj &

+       $(OBJS)\monodll_fontmap.obj &

        $(OBJS)\monodll_framecmn.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 &
        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &


@@ -1530,6 +1438,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagall.obj &
        $(OBJS)\monodll_imagbmp.obj &
        $(OBJS)\monodll_image.obj &
        $(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 &
        $(OBJS)\monodll_imaggif.obj &
        $(OBJS)\monodll_imagiff.obj &
        $(OBJS)\monodll_imagjpeg.obj &


@@ -1538,7 +1447,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagpnm.obj &
        $(OBJS)\monodll_imagtiff.obj &
        $(OBJS)\monodll_imagxpm.obj &
        $(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 &
        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &
        $(OBJS)\monodll_matrix.obj &


@@ -1549,18 +1457,41 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_prntbase.obj &
        $(OBJS)\monodll_quantize.obj &
        $(OBJS)\monodll_radiocmn.obj &
        $(OBJS)\monodll_prntbase.obj &
        $(OBJS)\monodll_quantize.obj &
        $(OBJS)\monodll_radiocmn.obj &

+       $(OBJS)\monodll_rendcmn.obj &

        $(OBJS)\monodll_rgncmn.obj &
        $(OBJS)\monodll_settcmn.obj &
        $(OBJS)\monodll_sizer.obj &
        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_tbarbase.obj &
        $(OBJS)\monodll_textcmn.obj &
        $(OBJS)\monodll_rgncmn.obj &
        $(OBJS)\monodll_settcmn.obj &
        $(OBJS)\monodll_sizer.obj &
        $(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_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
 !endif
 !endif
 !ifeq USE_GUI 1


@@ -1593,28 +1524,38 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_helpchm.obj &
        $(OBJS)\monodll_helpwin.obj &
        $(OBJS)\monodll_icon.obj &
        $(OBJS)\monodll_helpchm.obj &
        $(OBJS)\monodll_helpwin.obj &
        $(OBJS)\monodll_icon.obj &

-       $(OBJS)\monodll_joystick.obj &

        $(OBJS)\monodll_minifram.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_palette.obj &
        $(OBJS)\monodll_pen.obj &
        $(OBJS)\monodll_popupwin.obj &
        $(OBJS)\monodll_region.obj &

+       $(OBJS)\monodll_renderer.obj &

        $(OBJS)\monodll_settings.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_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_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_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 &
        $(OBJS)\monodll_bmpbuttn.obj &
        $(OBJS)\monodll_button.obj &
        $(OBJS)\monodll_checkbox.obj &


@@ -1623,9 +1564,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_colschem.obj &
        $(OBJS)\monodll_combobox.obj &
        $(OBJS)\monodll_control.obj &
        $(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_dialog.obj &
        $(OBJS)\monodll_framuniv.obj &

-       $(OBJS)\monodll_topluniv.obj &

        $(OBJS)\monodll_gauge.obj &
        $(OBJS)\monodll_inpcons.obj &
        $(OBJS)\monodll_inphand.obj &
        $(OBJS)\monodll_gauge.obj &
        $(OBJS)\monodll_inpcons.obj &
        $(OBJS)\monodll_inphand.obj &


@@ -1634,7 +1575,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_notebook.obj &
        $(OBJS)\monodll_radiobox.obj &
        $(OBJS)\monodll_radiobut.obj &
        $(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 &
        $(OBJS)\monodll_scrarrow.obj &
        $(OBJS)\monodll_scrolbar.obj &
        $(OBJS)\monodll_scrthumb.obj &


@@ -1645,58 +1585,15 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_statline.obj &
        $(OBJS)\monodll_stattext.obj &
        $(OBJS)\monodll_statusbr.obj &
        $(OBJS)\monodll_statline.obj &
        $(OBJS)\monodll_stattext.obj &
        $(OBJS)\monodll_statusbr.obj &

-       $(OBJS)\monodll_toolbar.obj &

        $(OBJS)\monodll_theme.obj &
        $(OBJS)\monodll_theme.obj &

+       $(OBJS)\monodll_toolbar.obj &
+       $(OBJS)\monodll_topluniv.obj &

        $(OBJS)\monodll_winuniv.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_gtk.obj &

-       $(OBJS)\monodll_win32.obj &

        $(OBJS)\monodll_metal.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_accesscmn.obj &

+       $(OBJS)\monodll_appcmn.obj &

        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
        $(OBJS)\monodll_bmpbase.obj &
        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
        $(OBJS)\monodll_bmpbase.obj &


@@ -1709,7 +1606,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_ctrlcmn.obj &
        $(OBJS)\monodll_ctrlsub.obj &
        $(OBJS)\monodll_datacmn.obj &
        $(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 &
        $(OBJS)\monodll_dcbase.obj &
        $(OBJS)\monodll_dlgcmn.obj &
        $(OBJS)\monodll_dndcmn.obj &


@@ -1722,9 +1618,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_fddlgcmn.obj &
        $(OBJS)\monodll_fldlgcmn.obj &
        $(OBJS)\monodll_fontcmn.obj &
        $(OBJS)\monodll_fddlgcmn.obj &
        $(OBJS)\monodll_fldlgcmn.obj &
        $(OBJS)\monodll_fontcmn.obj &

+       $(OBJS)\monodll_fontmap.obj &

        $(OBJS)\monodll_framecmn.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 &
        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &


@@ -1734,6 +1629,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagall.obj &
        $(OBJS)\monodll_imagbmp.obj &
        $(OBJS)\monodll_image.obj &
        $(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 &
        $(OBJS)\monodll_imaggif.obj &
        $(OBJS)\monodll_imagiff.obj &
        $(OBJS)\monodll_imagjpeg.obj &


@@ -1742,7 +1638,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagpnm.obj &
        $(OBJS)\monodll_imagtiff.obj &
        $(OBJS)\monodll_imagxpm.obj &
        $(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 &
        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &
        $(OBJS)\monodll_matrix.obj &


@@ -1753,73 +1648,150 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_prntbase.obj &
        $(OBJS)\monodll_quantize.obj &
        $(OBJS)\monodll_radiocmn.obj &
        $(OBJS)\monodll_prntbase.obj &
        $(OBJS)\monodll_quantize.obj &
        $(OBJS)\monodll_radiocmn.obj &

+       $(OBJS)\monodll_rendcmn.obj &

        $(OBJS)\monodll_rgncmn.obj &
        $(OBJS)\monodll_settcmn.obj &
        $(OBJS)\monodll_sizer.obj &
        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_tbarbase.obj &
        $(OBJS)\monodll_textcmn.obj &
        $(OBJS)\monodll_rgncmn.obj &
        $(OBJS)\monodll_settcmn.obj &
        $(OBJS)\monodll_sizer.obj &
        $(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_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) &
 !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_helpbest.obj &

+       $(OBJS)\monolib_helpctrl.obj &

        $(OBJS)\monolib_helpdata.obj &
        $(OBJS)\monolib_helpfrm.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_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_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_pre.obj &

-       $(OBJS)\monolib_m_tables.obj &

        $(OBJS)\monolib_m_style.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_dbgrid.obj &
+       $(OBJS)\monolib_dbtable.obj

 !endif
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(____CORE_SRC_FILENAMES_OBJECTS) &
 !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_helpbest.obj &

+       $(OBJS)\monodll_helpctrl.obj &

        $(OBJS)\monodll_helpdata.obj &
        $(OBJS)\monodll_helpfrm.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_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_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_pre.obj &

-       $(OBJS)\monodll_m_tables.obj &

        $(OBJS)\monodll_m_style.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_dbgrid.obj &
+       $(OBJS)\monodll_dbtable.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
 !endif
 __basedll___depname =
 !ifeq MONOLITHIC 0


@@ -1903,6 +1875,42 @@ __monolib___depname = &
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !endif
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !endif

+__netdll___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+__netdll___depname = &
+       $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll
+!endif
+!endif
+__netlib___depname =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 0
+__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)\wx$(PORTNAME)$(WXUNIVNAME)250$(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)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+!endif
+!endif
+!endif
+!endif

 __wxjpeg___depname =
 !ifeq USE_GUI 1
 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 __wxjpeg___depname =
 !ifeq USE_GUI 1
 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib


@@ -1932,13 +1940,58 @@ __xmllib___depname = &
 
 ### Variables: ###
 
 
 ### 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)
        $(__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 &
        $(__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 &


@@ -1952,8 +2005,6 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_config.obj &
        $(OBJS)\basedll_datetime.obj &
        $(OBJS)\basedll_datstrm.obj &
        $(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 &
        $(OBJS)\basedll_dircmn.obj &
        $(OBJS)\basedll_dynarray.obj &
        $(OBJS)\basedll_dynlib.obj &


@@ -1967,12 +2018,9 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_filename.obj &
        $(OBJS)\basedll_filesys.obj &
        $(OBJS)\basedll_fmapbase.obj &
        $(OBJS)\basedll_filename.obj &
        $(OBJS)\basedll_filesys.obj &
        $(OBJS)\basedll_fmapbase.obj &

-       $(OBJS)\basedll_fs_inet.obj &

        $(OBJS)\basedll_fs_zip.obj &
        $(OBJS)\basedll_fs_zip.obj &

-       $(OBJS)\basedll_ftp.obj &

        $(OBJS)\basedll_hash.obj &
        $(OBJS)\basedll_hashmap.obj &
        $(OBJS)\basedll_hash.obj &
        $(OBJS)\basedll_hashmap.obj &

-       $(OBJS)\basedll_http.obj &

        $(OBJS)\basedll_init.obj &
        $(OBJS)\basedll_intl.obj &
        $(OBJS)\basedll_ipcbase.obj &
        $(OBJS)\basedll_init.obj &
        $(OBJS)\basedll_intl.obj &
        $(OBJS)\basedll_ipcbase.obj &


@@ -1985,13 +2033,7 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_mstream.obj &
        $(OBJS)\basedll_object.obj &
        $(OBJS)\basedll_process.obj &
        $(OBJS)\basedll_mstream.obj &
        $(OBJS)\basedll_object.obj &
        $(OBJS)\basedll_process.obj &

-       $(OBJS)\basedll_protocol.obj &

        $(OBJS)\basedll_regex.obj &
        $(OBJS)\basedll_regex.obj &

-       $(OBJS)\basedll_sckaddr.obj &
-       $(OBJS)\basedll_sckfile.obj &
-       $(OBJS)\basedll_sckipc.obj &
-       $(OBJS)\basedll_sckstrm.obj &
-       $(OBJS)\basedll_socket.obj &

        $(OBJS)\basedll_stopwatch.obj &
        $(OBJS)\basedll_strconv.obj &
        $(OBJS)\basedll_stream.obj &
        $(OBJS)\basedll_stopwatch.obj &
        $(OBJS)\basedll_strconv.obj &
        $(OBJS)\basedll_stream.obj &


@@ -2002,15 +2044,13 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_tokenzr.obj &
        $(OBJS)\basedll_txtstrm.obj &
        $(OBJS)\basedll_unzip.obj &
        $(OBJS)\basedll_tokenzr.obj &
        $(OBJS)\basedll_txtstrm.obj &
        $(OBJS)\basedll_unzip.obj &

-       $(OBJS)\basedll_url.obj &

        $(OBJS)\basedll_variant.obj &
        $(OBJS)\basedll_wfstream.obj &
        $(OBJS)\basedll_wxchar.obj &
        $(OBJS)\basedll_zipstrm.obj &
        $(OBJS)\basedll_zstream.obj &
        $(OBJS)\basedll_variant.obj &
        $(OBJS)\basedll_wfstream.obj &
        $(OBJS)\basedll_wxchar.obj &
        $(OBJS)\basedll_zipstrm.obj &
        $(OBJS)\basedll_zstream.obj &

-       $(OBJS)\basedll_gsocket.obj &
-       $(OBJS)\basedll_gsockmsw.obj &

        $(OBJS)\basedll_basemsw.obj &
        $(OBJS)\basedll_basemsw.obj &

+       $(OBJS)\basedll_crashrpt.obj &

        $(OBJS)\basedll_dde.obj &
        $(OBJS)\basedll_dir.obj &
        $(OBJS)\basedll_mimetype.obj &
        $(OBJS)\basedll_dde.obj &
        $(OBJS)\basedll_dir.obj &
        $(OBJS)\basedll_mimetype.obj &


@@ -2020,7 +2060,6 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_thread.obj &
        $(OBJS)\basedll_utils.obj &
        $(OBJS)\basedll_utilsexc.obj &
        $(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 &
        $(OBJS)\basedll_event.obj &
        $(OBJS)\basedll_fs_mem.obj &
        $(OBJS)\basedll_msgout.obj &


@@ -2028,12 +2067,12 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_main.obj &
        $(OBJS)\basedll_mslu.obj &
        $(OBJS)\basedll_volume.obj
        $(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)
        $(__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 &
        $(__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 &


@@ -2047,8 +2086,6 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_config.obj &
        $(OBJS)\baselib_datetime.obj &
        $(OBJS)\baselib_datstrm.obj &
        $(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 &
        $(OBJS)\baselib_dircmn.obj &
        $(OBJS)\baselib_dynarray.obj &
        $(OBJS)\baselib_dynlib.obj &


@@ -2062,12 +2099,9 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_filename.obj &
        $(OBJS)\baselib_filesys.obj &
        $(OBJS)\baselib_fmapbase.obj &
        $(OBJS)\baselib_filename.obj &
        $(OBJS)\baselib_filesys.obj &
        $(OBJS)\baselib_fmapbase.obj &

-       $(OBJS)\baselib_fs_inet.obj &

        $(OBJS)\baselib_fs_zip.obj &
        $(OBJS)\baselib_fs_zip.obj &

-       $(OBJS)\baselib_ftp.obj &

        $(OBJS)\baselib_hash.obj &
        $(OBJS)\baselib_hashmap.obj &
        $(OBJS)\baselib_hash.obj &
        $(OBJS)\baselib_hashmap.obj &

-       $(OBJS)\baselib_http.obj &

        $(OBJS)\baselib_init.obj &
        $(OBJS)\baselib_intl.obj &
        $(OBJS)\baselib_ipcbase.obj &
        $(OBJS)\baselib_init.obj &
        $(OBJS)\baselib_intl.obj &
        $(OBJS)\baselib_ipcbase.obj &


@@ -2080,13 +2114,7 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_mstream.obj &
        $(OBJS)\baselib_object.obj &
        $(OBJS)\baselib_process.obj &
        $(OBJS)\baselib_mstream.obj &
        $(OBJS)\baselib_object.obj &
        $(OBJS)\baselib_process.obj &

-       $(OBJS)\baselib_protocol.obj &

        $(OBJS)\baselib_regex.obj &
        $(OBJS)\baselib_regex.obj &

-       $(OBJS)\baselib_sckaddr.obj &
-       $(OBJS)\baselib_sckfile.obj &
-       $(OBJS)\baselib_sckipc.obj &
-       $(OBJS)\baselib_sckstrm.obj &
-       $(OBJS)\baselib_socket.obj &

        $(OBJS)\baselib_stopwatch.obj &
        $(OBJS)\baselib_strconv.obj &
        $(OBJS)\baselib_stream.obj &
        $(OBJS)\baselib_stopwatch.obj &
        $(OBJS)\baselib_strconv.obj &
        $(OBJS)\baselib_stream.obj &


@@ -2097,15 +2125,13 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_tokenzr.obj &
        $(OBJS)\baselib_txtstrm.obj &
        $(OBJS)\baselib_unzip.obj &
        $(OBJS)\baselib_tokenzr.obj &
        $(OBJS)\baselib_txtstrm.obj &
        $(OBJS)\baselib_unzip.obj &

-       $(OBJS)\baselib_url.obj &

        $(OBJS)\baselib_variant.obj &
        $(OBJS)\baselib_wfstream.obj &
        $(OBJS)\baselib_wxchar.obj &
        $(OBJS)\baselib_zipstrm.obj &
        $(OBJS)\baselib_zstream.obj &
        $(OBJS)\baselib_variant.obj &
        $(OBJS)\baselib_wfstream.obj &
        $(OBJS)\baselib_wxchar.obj &
        $(OBJS)\baselib_zipstrm.obj &
        $(OBJS)\baselib_zstream.obj &

-       $(OBJS)\baselib_gsocket.obj &
-       $(OBJS)\baselib_gsockmsw.obj &

        $(OBJS)\baselib_basemsw.obj &
        $(OBJS)\baselib_basemsw.obj &

+       $(OBJS)\baselib_crashrpt.obj &

        $(OBJS)\baselib_dde.obj &
        $(OBJS)\baselib_dir.obj &
        $(OBJS)\baselib_mimetype.obj &
        $(OBJS)\baselib_dde.obj &
        $(OBJS)\baselib_dir.obj &
        $(OBJS)\baselib_mimetype.obj &


@@ -2115,7 +2141,6 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_thread.obj &
        $(OBJS)\baselib_utils.obj &
        $(OBJS)\baselib_utilsexc.obj &
        $(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 &
        $(OBJS)\baselib_event.obj &
        $(OBJS)\baselib_fs_mem.obj &
        $(OBJS)\baselib_msgout.obj &


@@ -2123,7 +2148,7 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_main.obj &
        $(OBJS)\baselib_mslu.obj &
        $(OBJS)\baselib_volume.obj
        $(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 &
        $(__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 &


@@ -2139,7 +2164,7 @@ COREDLL_OBJECTS =  &
        $(OBJS)\coredll_mslu.obj &
        $(OBJS)\coredll_volume.obj &
        $(____CORE_SRC_FILENAMES_2_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 &
        $(__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 &


@@ -2155,7 +2180,7 @@ CORELIB_OBJECTS =  &
        $(OBJS)\corelib_mslu.obj &
        $(OBJS)\corelib_volume.obj &
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
        $(OBJS)\corelib_mslu.obj &
        $(OBJS)\corelib_volume.obj &
        $(____CORE_SRC_FILENAMES_3_OBJECTS)

-GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+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 &
        $(__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 &


@@ -2164,7 +2189,7 @@ GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 GLDLL_OBJECTS =  &
        $(OBJS)\gldll_dummy.obj &
        $(OBJS)\gldll_glcanvas.obj
 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 &
        $(__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 &


@@ -2172,7 +2197,7 @@ GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 GLLIB_OBJECTS =  &
        $(OBJS)\gllib_dummy.obj &
        $(OBJS)\gllib_glcanvas.obj
 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 &
        $(__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 &


@@ -2181,28 +2206,28 @@ HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 HTMLDLL_OBJECTS =  &
        $(OBJS)\htmldll_dummy.obj &
        $(OBJS)\htmldll_helpbest.obj &
 HTMLDLL_OBJECTS =  &
        $(OBJS)\htmldll_dummy.obj &
        $(OBJS)\htmldll_helpbest.obj &

+       $(OBJS)\htmldll_helpctrl.obj &

        $(OBJS)\htmldll_helpdata.obj &
        $(OBJS)\htmldll_helpfrm.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_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_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_pre.obj &

-       $(OBJS)\htmldll_m_tables.obj &

        $(OBJS)\htmldll_m_style.obj &
        $(OBJS)\htmldll_m_style.obj &

-       $(OBJS)\htmldll_htmprint.obj &
+       $(OBJS)\htmldll_m_tables.obj &
+       $(OBJS)\htmldll_winpars.obj &

        $(OBJS)\htmldll_htmllbox.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 &
        $(__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 &


@@ -2210,35 +2235,35 @@ HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_dummy.obj &
        $(OBJS)\htmllib_helpbest.obj &
 HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_dummy.obj &
        $(OBJS)\htmllib_helpbest.obj &

+       $(OBJS)\htmllib_helpctrl.obj &

        $(OBJS)\htmllib_helpdata.obj &
        $(OBJS)\htmllib_helpfrm.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_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_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_pre.obj &

-       $(OBJS)\htmllib_m_tables.obj &

        $(OBJS)\htmllib_m_style.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)
        $(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)
        $(__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 &
        $(__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 &


@@ -2252,8 +2277,6 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_config.obj &
        $(OBJS)\monodll_datetime.obj &
        $(OBJS)\monodll_datstrm.obj &
        $(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 &
        $(OBJS)\monodll_dircmn.obj &
        $(OBJS)\monodll_dynarray.obj &
        $(OBJS)\monodll_dynlib.obj &


@@ -2267,12 +2290,9 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_filename.obj &
        $(OBJS)\monodll_filesys.obj &
        $(OBJS)\monodll_fmapbase.obj &
        $(OBJS)\monodll_filename.obj &
        $(OBJS)\monodll_filesys.obj &
        $(OBJS)\monodll_fmapbase.obj &

-       $(OBJS)\monodll_fs_inet.obj &

        $(OBJS)\monodll_fs_zip.obj &
        $(OBJS)\monodll_fs_zip.obj &

-       $(OBJS)\monodll_ftp.obj &

        $(OBJS)\monodll_hash.obj &
        $(OBJS)\monodll_hashmap.obj &
        $(OBJS)\monodll_hash.obj &
        $(OBJS)\monodll_hashmap.obj &

-       $(OBJS)\monodll_http.obj &

        $(OBJS)\monodll_init.obj &
        $(OBJS)\monodll_intl.obj &
        $(OBJS)\monodll_ipcbase.obj &
        $(OBJS)\monodll_init.obj &
        $(OBJS)\monodll_intl.obj &
        $(OBJS)\monodll_ipcbase.obj &


@@ -2285,13 +2305,7 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_mstream.obj &
        $(OBJS)\monodll_object.obj &
        $(OBJS)\monodll_process.obj &
        $(OBJS)\monodll_mstream.obj &
        $(OBJS)\monodll_object.obj &
        $(OBJS)\monodll_process.obj &

-       $(OBJS)\monodll_protocol.obj &

        $(OBJS)\monodll_regex.obj &
        $(OBJS)\monodll_regex.obj &

-       $(OBJS)\monodll_sckaddr.obj &
-       $(OBJS)\monodll_sckfile.obj &
-       $(OBJS)\monodll_sckipc.obj &
-       $(OBJS)\monodll_sckstrm.obj &
-       $(OBJS)\monodll_socket.obj &

        $(OBJS)\monodll_stopwatch.obj &
        $(OBJS)\monodll_strconv.obj &
        $(OBJS)\monodll_stream.obj &
        $(OBJS)\monodll_stopwatch.obj &
        $(OBJS)\monodll_strconv.obj &
        $(OBJS)\monodll_stream.obj &


@@ -2302,15 +2316,13 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_tokenzr.obj &
        $(OBJS)\monodll_txtstrm.obj &
        $(OBJS)\monodll_unzip.obj &
        $(OBJS)\monodll_tokenzr.obj &
        $(OBJS)\monodll_txtstrm.obj &
        $(OBJS)\monodll_unzip.obj &

-       $(OBJS)\monodll_url.obj &

        $(OBJS)\monodll_variant.obj &
        $(OBJS)\monodll_wfstream.obj &
        $(OBJS)\monodll_wxchar.obj &
        $(OBJS)\monodll_zipstrm.obj &
        $(OBJS)\monodll_zstream.obj &
        $(OBJS)\monodll_variant.obj &
        $(OBJS)\monodll_wfstream.obj &
        $(OBJS)\monodll_wxchar.obj &
        $(OBJS)\monodll_zipstrm.obj &
        $(OBJS)\monodll_zstream.obj &

-       $(OBJS)\monodll_gsocket.obj &
-       $(OBJS)\monodll_gsockmsw.obj &

        $(OBJS)\monodll_basemsw.obj &
        $(OBJS)\monodll_basemsw.obj &

+       $(OBJS)\monodll_crashrpt.obj &

        $(OBJS)\monodll_dde.obj &
        $(OBJS)\monodll_dir.obj &
        $(OBJS)\monodll_mimetype.obj &
        $(OBJS)\monodll_dde.obj &
        $(OBJS)\monodll_dir.obj &
        $(OBJS)\monodll_mimetype.obj &


@@ -2320,7 +2332,6 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_thread.obj &
        $(OBJS)\monodll_utils.obj &
        $(OBJS)\monodll_utilsexc.obj &
        $(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 &
        $(OBJS)\monodll_event.obj &
        $(OBJS)\monodll_fs_mem.obj &
        $(OBJS)\monodll_msgout.obj &


@@ -2328,14 +2339,26 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_main.obj &
        $(OBJS)\monodll_mslu.obj &
        $(OBJS)\monodll_volume.obj &
        $(OBJS)\monodll_main.obj &
        $(OBJS)\monodll_mslu.obj &
        $(OBJS)\monodll_volume.obj &

+       $(OBJS)\monodll_fs_inet.obj &
+       $(OBJS)\monodll_ftp.obj &
+       $(OBJS)\monodll_http.obj &
+       $(OBJS)\monodll_protocol.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_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)
        $(__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 &
        $(__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 &


@@ -2349,8 +2372,6 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_config.obj &
        $(OBJS)\monolib_datetime.obj &
        $(OBJS)\monolib_datstrm.obj &
        $(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 &
        $(OBJS)\monolib_dircmn.obj &
        $(OBJS)\monolib_dynarray.obj &
        $(OBJS)\monolib_dynlib.obj &


@@ -2364,12 +2385,9 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_filename.obj &
        $(OBJS)\monolib_filesys.obj &
        $(OBJS)\monolib_fmapbase.obj &
        $(OBJS)\monolib_filename.obj &
        $(OBJS)\monolib_filesys.obj &
        $(OBJS)\monolib_fmapbase.obj &

-       $(OBJS)\monolib_fs_inet.obj &

        $(OBJS)\monolib_fs_zip.obj &
        $(OBJS)\monolib_fs_zip.obj &

-       $(OBJS)\monolib_ftp.obj &

        $(OBJS)\monolib_hash.obj &
        $(OBJS)\monolib_hashmap.obj &
        $(OBJS)\monolib_hash.obj &
        $(OBJS)\monolib_hashmap.obj &

-       $(OBJS)\monolib_http.obj &

        $(OBJS)\monolib_init.obj &
        $(OBJS)\monolib_intl.obj &
        $(OBJS)\monolib_ipcbase.obj &
        $(OBJS)\monolib_init.obj &
        $(OBJS)\monolib_intl.obj &
        $(OBJS)\monolib_ipcbase.obj &


@@ -2382,13 +2400,7 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_mstream.obj &
        $(OBJS)\monolib_object.obj &
        $(OBJS)\monolib_process.obj &
        $(OBJS)\monolib_mstream.obj &
        $(OBJS)\monolib_object.obj &
        $(OBJS)\monolib_process.obj &

-       $(OBJS)\monolib_protocol.obj &

        $(OBJS)\monolib_regex.obj &
        $(OBJS)\monolib_regex.obj &

-       $(OBJS)\monolib_sckaddr.obj &
-       $(OBJS)\monolib_sckfile.obj &
-       $(OBJS)\monolib_sckipc.obj &
-       $(OBJS)\monolib_sckstrm.obj &
-       $(OBJS)\monolib_socket.obj &

        $(OBJS)\monolib_stopwatch.obj &
        $(OBJS)\monolib_strconv.obj &
        $(OBJS)\monolib_stream.obj &
        $(OBJS)\monolib_stopwatch.obj &
        $(OBJS)\monolib_strconv.obj &
        $(OBJS)\monolib_stream.obj &


@@ -2399,15 +2411,13 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_tokenzr.obj &
        $(OBJS)\monolib_txtstrm.obj &
        $(OBJS)\monolib_unzip.obj &
        $(OBJS)\monolib_tokenzr.obj &
        $(OBJS)\monolib_txtstrm.obj &
        $(OBJS)\monolib_unzip.obj &

-       $(OBJS)\monolib_url.obj &

        $(OBJS)\monolib_variant.obj &
        $(OBJS)\monolib_wfstream.obj &
        $(OBJS)\monolib_wxchar.obj &
        $(OBJS)\monolib_zipstrm.obj &
        $(OBJS)\monolib_zstream.obj &
        $(OBJS)\monolib_variant.obj &
        $(OBJS)\monolib_wfstream.obj &
        $(OBJS)\monolib_wxchar.obj &
        $(OBJS)\monolib_zipstrm.obj &
        $(OBJS)\monolib_zstream.obj &

-       $(OBJS)\monolib_gsocket.obj &
-       $(OBJS)\monolib_gsockmsw.obj &

        $(OBJS)\monolib_basemsw.obj &
        $(OBJS)\monolib_basemsw.obj &

+       $(OBJS)\monolib_crashrpt.obj &

        $(OBJS)\monolib_dde.obj &
        $(OBJS)\monolib_dir.obj &
        $(OBJS)\monolib_mimetype.obj &
        $(OBJS)\monolib_dde.obj &
        $(OBJS)\monolib_dir.obj &
        $(OBJS)\monolib_mimetype.obj &


@@ -2417,7 +2427,6 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_thread.obj &
        $(OBJS)\monolib_utils.obj &
        $(OBJS)\monolib_utilsexc.obj &
        $(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 &
        $(OBJS)\monolib_event.obj &
        $(OBJS)\monolib_fs_mem.obj &
        $(OBJS)\monolib_msgout.obj &


@@ -2425,17 +2434,100 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_main.obj &
        $(OBJS)\monolib_mslu.obj &
        $(OBJS)\monolib_volume.obj &
        $(OBJS)\monolib_main.obj &
        $(OBJS)\monolib_mslu.obj &
        $(OBJS)\monolib_volume.obj &

+       $(OBJS)\monolib_fs_inet.obj &
+       $(OBJS)\monolib_ftp.obj &
+       $(OBJS)\monolib_http.obj &
+       $(OBJS)\monolib_protocol.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
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) &
        $(OBJS)\monolib_xml.obj

+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 $(__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 $(CXXFLAGS) &
+       /fh=$(OBJS)\wxprec_netdll.pch
+NETDLL_OBJECTS =  &
+       $(OBJS)\netdll_dummy.obj &
+       $(OBJS)\netdll_fs_inet.obj &
+       $(OBJS)\netdll_ftp.obj &
+       $(OBJS)\netdll_http.obj &
+       $(OBJS)\netdll_protocol.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) $(__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) $(__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 $(CXXFLAGS) &
+       /fh=$(OBJS)\wxprec_netlib.pch
+NETLIB_OBJECTS =  &
+       $(OBJS)\netlib_dummy.obj &
+       $(OBJS)\netlib_fs_inet.obj &
+       $(OBJS)\netlib_ftp.obj &
+       $(OBJS)\netlib_http.obj &
+       $(OBJS)\netlib_protocol.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)
 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_dbgrid.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_dbgrid.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
        $(__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 &
        $(__RUNTIME_LIBS) -i=$(LIBDIRNAME) $(CFLAGS)
 WXJPEG_OBJECTS =  &
        $(OBJS)\wxjpeg_jcomapi.obj &


@@ -2484,7 +2576,7 @@ WXJPEG_OBJECTS =  &
        $(OBJS)\wxjpeg_jquant1.obj &
        $(OBJS)\wxjpeg_jquant2.obj &
        $(OBJS)\wxjpeg_jdmerge.obj
        $(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 &
        $(__RUNTIME_LIBS) -i=..\src\zlib $(CFLAGS)
 WXPNG_OBJECTS =  &
        $(OBJS)\wxpng_png.obj &


@@ -2504,14 +2596,14 @@ WXPNG_OBJECTS =  &
        $(OBJS)\wxpng_pngwrite.obj &
        $(OBJS)\wxpng_pngwtran.obj &
        $(OBJS)\wxpng_pngwutil.obj
        $(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
        $(__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 &
        $(__RUNTIME_LIBS) $(CFLAGS)
 WXTIFF_OBJECTS =  &
        $(OBJS)\wxtiff_tif_win32.obj &


@@ -2547,7 +2639,7 @@ WXTIFF_OBJECTS =  &
        $(OBJS)\wxtiff_tif_warning.obj &
        $(OBJS)\wxtiff_tif_write.obj &
        $(OBJS)\wxtiff_tif_zip.obj
        $(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 &
        $(__RUNTIME_LIBS) $(CFLAGS)
 WXZLIB_OBJECTS =  &
        $(OBJS)\wxzlib_adler32.obj &


@@ -2564,7 +2656,7 @@ WXZLIB_OBJECTS =  &
        $(OBJS)\wxzlib_infcodes.obj &
        $(OBJS)\wxzlib_infutil.obj &
        $(OBJS)\wxzlib_inffast.obj
        $(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 &
        $(__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 &


@@ -2573,7 +2665,7 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 XMLDLL_OBJECTS =  &
        $(OBJS)\xmldll_dummy.obj &
        $(OBJS)\xmldll_xml.obj
 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 &
        $(__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 &


@@ -2590,7 +2682,103 @@ $(OBJS) :
 
 ### Targets: ###
 
 
 ### 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) $(__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) $(__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) $<
 
 $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\src\common\appbase.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<


@@ -2616,12 +2804,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_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) $<
 
 $(OBJS)\basedll_dde.obj :  .AUTODEPEND ..\src\msw\dde.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 


@@ -2673,33 +2855,18 @@ $(OBJS)\basedll_filesys.obj :  .AUTODEPEND ..\src\common\filesys.cpp
 $(OBJS)\basedll_fmapbase.obj :  .AUTODEPEND ..\src\common\fmapbase.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_fmapbase.obj :  .AUTODEPEND ..\src\common\fmapbase.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 

-$(OBJS)\basedll_fs_inet.obj :  .AUTODEPEND ..\src\common\fs_inet.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-

 $(OBJS)\basedll_fs_mem.obj :  .AUTODEPEND ..\src\common\fs_mem.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_fs_zip.obj :  .AUTODEPEND ..\src\common\fs_zip.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_fs_mem.obj :  .AUTODEPEND ..\src\common\fs_mem.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_fs_zip.obj :  .AUTODEPEND ..\src\common\fs_zip.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 

-$(OBJS)\basedll_ftp.obj :  .AUTODEPEND ..\src\common\ftp.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_gsocket.obj :  .AUTODEPEND ..\src\msw\gsocket.c
-       $(CC) -zq -fo=$^@ $(BASEDLL_CFLAGS) $<
-
-$(OBJS)\basedll_gsockmsw.obj :  .AUTODEPEND ..\src\msw\gsockmsw.c
-       $(CC) -zq -fo=$^@ $(BASEDLL_CFLAGS) $<
-

 $(OBJS)\basedll_hash.obj :  .AUTODEPEND ..\src\common\hash.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_hashmap.obj :  .AUTODEPEND ..\src\common\hashmap.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_hash.obj :  .AUTODEPEND ..\src\common\hash.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_hashmap.obj :  .AUTODEPEND ..\src\common\hashmap.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 

-$(OBJS)\basedll_http.obj :  .AUTODEPEND ..\src\common\http.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-

 $(OBJS)\basedll_init.obj :  .AUTODEPEND ..\src\common\init.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_init.obj :  .AUTODEPEND ..\src\common\init.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 


@@ -2748,9 +2915,6 @@ $(OBJS)\basedll_object.obj :  .AUTODEPEND ..\src\common\object.cpp
 $(OBJS)\basedll_process.obj :  .AUTODEPEND ..\src\common\process.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_process.obj :  .AUTODEPEND ..\src\common\process.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 

-$(OBJS)\basedll_protocol.obj :  .AUTODEPEND ..\src\common\protocol.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-

 $(OBJS)\basedll_regconf.obj :  .AUTODEPEND ..\src\msw\regconf.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_regconf.obj :  .AUTODEPEND ..\src\msw\regconf.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 


@@ -2760,24 +2924,9 @@ $(OBJS)\basedll_regex.obj :  .AUTODEPEND ..\src\common\regex.cpp
 $(OBJS)\basedll_registry.obj :  .AUTODEPEND ..\src\msw\registry.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_registry.obj :  .AUTODEPEND ..\src\msw\registry.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 

-$(OBJS)\basedll_sckaddr.obj :  .AUTODEPEND ..\src\common\sckaddr.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_sckfile.obj :  .AUTODEPEND ..\src\common\sckfile.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_sckipc.obj :  .AUTODEPEND ..\src\common\sckipc.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
-$(OBJS)\basedll_sckstrm.obj :  .AUTODEPEND ..\src\common\sckstrm.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-

 $(OBJS)\basedll_snglinst.obj :  .AUTODEPEND ..\src\msw\snglinst.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_snglinst.obj :  .AUTODEPEND ..\src\msw\snglinst.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 

-$(OBJS)\basedll_socket.obj :  .AUTODEPEND ..\src\common\socket.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-

 $(OBJS)\basedll_stopwatch.obj :  .AUTODEPEND ..\src\common\stopwatch.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_stopwatch.obj :  .AUTODEPEND ..\src\common\stopwatch.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 


@@ -2811,9 +2960,6 @@ $(OBJS)\basedll_txtstrm.obj :  .AUTODEPEND ..\src\common\txtstrm.cpp
 $(OBJS)\basedll_unzip.obj :  .AUTODEPEND ..\src\common\unzip.c
        $(CC) -zq -fo=$^@ $(BASEDLL_CFLAGS) $<
 
 $(OBJS)\basedll_unzip.obj :  .AUTODEPEND ..\src\common\unzip.c
        $(CC) -zq -fo=$^@ $(BASEDLL_CFLAGS) $<
 

-$(OBJS)\basedll_url.obj :  .AUTODEPEND ..\src\common\url.cpp
-       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-

 $(OBJS)\basedll_utils.obj :  .AUTODEPEND ..\src\msw\utils.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_utils.obj :  .AUTODEPEND ..\src\msw\utils.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 


@@ -2865,12 +3011,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_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) $<
 
 $(OBJS)\baselib_dde.obj :  .AUTODEPEND ..\src\msw\dde.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 


@@ -2922,33 +3062,18 @@ $(OBJS)\baselib_filesys.obj :  .AUTODEPEND ..\src\common\filesys.cpp
 $(OBJS)\baselib_fmapbase.obj :  .AUTODEPEND ..\src\common\fmapbase.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_fmapbase.obj :  .AUTODEPEND ..\src\common\fmapbase.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 

-$(OBJS)\baselib_fs_inet.obj :  .AUTODEPEND ..\src\common\fs_inet.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-

 $(OBJS)\baselib_fs_mem.obj :  .AUTODEPEND ..\src\common\fs_mem.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_fs_zip.obj :  .AUTODEPEND ..\src\common\fs_zip.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_fs_mem.obj :  .AUTODEPEND ..\src\common\fs_mem.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_fs_zip.obj :  .AUTODEPEND ..\src\common\fs_zip.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 

-$(OBJS)\baselib_ftp.obj :  .AUTODEPEND ..\src\common\ftp.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_gsocket.obj :  .AUTODEPEND ..\src\msw\gsocket.c
-       $(CC) -zq -fo=$^@ $(BASELIB_CFLAGS) $<
-
-$(OBJS)\baselib_gsockmsw.obj :  .AUTODEPEND ..\src\msw\gsockmsw.c
-       $(CC) -zq -fo=$^@ $(BASELIB_CFLAGS) $<
-

 $(OBJS)\baselib_hash.obj :  .AUTODEPEND ..\src\common\hash.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_hashmap.obj :  .AUTODEPEND ..\src\common\hashmap.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_hash.obj :  .AUTODEPEND ..\src\common\hash.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_hashmap.obj :  .AUTODEPEND ..\src\common\hashmap.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 

-$(OBJS)\baselib_http.obj :  .AUTODEPEND ..\src\common\http.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-

 $(OBJS)\baselib_init.obj :  .AUTODEPEND ..\src\common\init.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_init.obj :  .AUTODEPEND ..\src\common\init.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 


@@ -2997,9 +3122,6 @@ $(OBJS)\baselib_object.obj :  .AUTODEPEND ..\src\common\object.cpp
 $(OBJS)\baselib_process.obj :  .AUTODEPEND ..\src\common\process.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_process.obj :  .AUTODEPEND ..\src\common\process.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 

-$(OBJS)\baselib_protocol.obj :  .AUTODEPEND ..\src\common\protocol.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-

 $(OBJS)\baselib_regconf.obj :  .AUTODEPEND ..\src\msw\regconf.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_regconf.obj :  .AUTODEPEND ..\src\msw\regconf.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 


@@ -3009,24 +3131,9 @@ $(OBJS)\baselib_regex.obj :  .AUTODEPEND ..\src\common\regex.cpp
 $(OBJS)\baselib_registry.obj :  .AUTODEPEND ..\src\msw\registry.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_registry.obj :  .AUTODEPEND ..\src\msw\registry.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 

-$(OBJS)\baselib_sckaddr.obj :  .AUTODEPEND ..\src\common\sckaddr.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_sckfile.obj :  .AUTODEPEND ..\src\common\sckfile.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_sckipc.obj :  .AUTODEPEND ..\src\common\sckipc.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
-$(OBJS)\baselib_sckstrm.obj :  .AUTODEPEND ..\src\common\sckstrm.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-

 $(OBJS)\baselib_snglinst.obj :  .AUTODEPEND ..\src\msw\snglinst.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_snglinst.obj :  .AUTODEPEND ..\src\msw\snglinst.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 

-$(OBJS)\baselib_socket.obj :  .AUTODEPEND ..\src\common\socket.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-

 $(OBJS)\baselib_stopwatch.obj :  .AUTODEPEND ..\src\common\stopwatch.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_stopwatch.obj :  .AUTODEPEND ..\src\common\stopwatch.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 


@@ -3060,9 +3167,6 @@ $(OBJS)\baselib_txtstrm.obj :  .AUTODEPEND ..\src\common\txtstrm.cpp
 $(OBJS)\baselib_unzip.obj :  .AUTODEPEND ..\src\common\unzip.c
        $(CC) -zq -fo=$^@ $(BASELIB_CFLAGS) $<
 
 $(OBJS)\baselib_unzip.obj :  .AUTODEPEND ..\src\common\unzip.c
        $(CC) -zq -fo=$^@ $(BASELIB_CFLAGS) $<
 

-$(OBJS)\baselib_url.obj :  .AUTODEPEND ..\src\common\url.cpp
-       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-

 $(OBJS)\baselib_utils.obj :  .AUTODEPEND ..\src\msw\utils.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_utils.obj :  .AUTODEPEND ..\src\msw\utils.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 


@@ -3185,11 +3289,6 @@ $(OBJS)\coredll_button.obj :  .AUTODEPEND ..\src\msw\button.cpp
 !endif
 !endif
 
 !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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_caret.obj :  .AUTODEPEND ..\src\msw\caret.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -3324,6 +3423,9 @@ $(OBJS)\coredll_ctrlcmn.obj :  .AUTODEPEND ..\src\common\ctrlcmn.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_ctrlsub.obj :  .AUTODEPEND ..\src\common\ctrlsub.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -3349,11 +3451,6 @@ $(OBJS)\coredll_dataobj.obj :  .AUTODEPEND ..\src\msw\ole\dataobj.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_dc.obj :  .AUTODEPEND ..\src\msw\dc.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -3364,11 +3461,6 @@ $(OBJS)\coredll_dcbase.obj :  .AUTODEPEND ..\src\common\dcbase.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_dcclient.obj :  .AUTODEPEND ..\src\msw\dcclient.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -3621,21 +3713,6 @@ $(OBJS)\coredll_gifdecod.obj :  .AUTODEPEND ..\src\common\gifdecod.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 
 $(OBJS)\coredll_gtk.obj :  .AUTODEPEND ..\src\univ\themes\gtk.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 


@@ -3649,11 +3726,6 @@ $(OBJS)\coredll_helpchm.obj :  .AUTODEPEND ..\src\msw\helpchm.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_helpwin.obj :  .AUTODEPEND ..\src\msw\helpwin.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -3752,21 +3824,11 @@ $(OBJS)\coredll_inpcons.obj :  .AUTODEPEND ..\src\univ\inpcons.cpp
 $(OBJS)\coredll_inphand.obj :  .AUTODEPEND ..\src\univ\inphand.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(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_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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_lboxcmn.obj :  .AUTODEPEND ..\src\common\lboxcmn.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -3995,18 +4057,14 @@ $(OBJS)\coredll_region.obj :  .AUTODEPEND ..\src\msw\region.cpp
 !endif
 
 !ifeq USE_GUI 1
 !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
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif

-!endif

 
 !ifeq USE_GUI 1
 
 !ifeq USE_GUI 1

-!ifeq WXUNIV 0

 $(OBJS)\coredll_renderer.obj :  .AUTODEPEND ..\src\msw\renderer.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\coredll_renderg.obj :  .AUTODEPEND ..\src\generic\renderg.cpp


@@ -4018,11 +4076,6 @@ $(OBJS)\coredll_rgncmn.obj :  .AUTODEPEND ..\src\common\rgncmn.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 
 $(OBJS)\coredll_scrarrow.obj :  .AUTODEPEND ..\src\univ\scrarrow.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 


@@ -4096,11 +4149,6 @@ $(OBJS)\coredll_spinctlg.obj :  .AUTODEPEND ..\src\generic\spinctlg.cpp
 $(OBJS)\coredll_spinctrl.obj :  .AUTODEPEND ..\src\msw\spinctrl.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_splitter.obj :  .AUTODEPEND ..\src\generic\splitter.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -4190,16 +4238,6 @@ $(OBJS)\coredll_tabctrl.obj :  .AUTODEPEND ..\src\msw\tabctrl.cpp
 $(OBJS)\coredll_tabg.obj :  .AUTODEPEND ..\src\generic\tabg.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(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) $<
 
 $(OBJS)\coredll_tbar95.obj :  .AUTODEPEND ..\src\msw\tbar95.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 


@@ -4253,11 +4291,6 @@ $(OBJS)\coredll_timercmn.obj :  .AUTODEPEND ..\src\common\timercmn.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_tipwin.obj :  .AUTODEPEND ..\src\generic\tipwin.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -4310,8 +4343,10 @@ $(OBJS)\coredll_uuid.obj :  .AUTODEPEND ..\src\msw\ole\uuid.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1

 $(OBJS)\coredll_uxtheme.obj :  .AUTODEPEND ..\src\msw\uxtheme.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\coredll_valgen.obj :  .AUTODEPEND ..\src\common\valgen.cpp


@@ -4341,11 +4376,6 @@ $(OBJS)\coredll_vscroll.obj :  .AUTODEPEND ..\src\generic\vscroll.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 
 $(OBJS)\coredll_win32.obj :  .AUTODEPEND ..\src\univ\themes\win32.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 


@@ -4362,11 +4392,6 @@ $(OBJS)\coredll_window.obj :  .AUTODEPEND ..\src\msw\window.cpp
 $(OBJS)\coredll_winuniv.obj :  .AUTODEPEND ..\src\univ\winuniv.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_xpmdecod.obj :  .AUTODEPEND ..\src\common\xpmdecod.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -4467,11 +4492,6 @@ $(OBJS)\corelib_button.obj :  .AUTODEPEND ..\src\msw\button.cpp
 !endif
 !endif
 
 !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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_caret.obj :  .AUTODEPEND ..\src\msw\caret.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -4606,6 +4626,9 @@ $(OBJS)\corelib_ctrlcmn.obj :  .AUTODEPEND ..\src\common\ctrlcmn.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_ctrlsub.obj :  .AUTODEPEND ..\src\common\ctrlsub.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -4631,11 +4654,6 @@ $(OBJS)\corelib_dataobj.obj :  .AUTODEPEND ..\src\msw\ole\dataobj.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_dc.obj :  .AUTODEPEND ..\src\msw\dc.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -4646,11 +4664,6 @@ $(OBJS)\corelib_dcbase.obj :  .AUTODEPEND ..\src\common\dcbase.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_dcclient.obj :  .AUTODEPEND ..\src\msw\dcclient.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -4903,21 +4916,6 @@ $(OBJS)\corelib_gifdecod.obj :  .AUTODEPEND ..\src\common\gifdecod.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 
 $(OBJS)\corelib_gtk.obj :  .AUTODEPEND ..\src\univ\themes\gtk.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 


@@ -4931,11 +4929,6 @@ $(OBJS)\corelib_helpchm.obj :  .AUTODEPEND ..\src\msw\helpchm.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_helpwin.obj :  .AUTODEPEND ..\src\msw\helpwin.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -5034,21 +5027,11 @@ $(OBJS)\corelib_inpcons.obj :  .AUTODEPEND ..\src\univ\inpcons.cpp
 $(OBJS)\corelib_inphand.obj :  .AUTODEPEND ..\src\univ\inphand.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(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_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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_lboxcmn.obj :  .AUTODEPEND ..\src\common\lboxcmn.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -5277,18 +5260,14 @@ $(OBJS)\corelib_region.obj :  .AUTODEPEND ..\src\msw\region.cpp
 !endif
 
 !ifeq USE_GUI 1
 !endif
 
 !ifeq USE_GUI 1

-!ifeq WXUNIV 1
-$(OBJS)\corelib_renderer.obj :  .AUTODEPEND ..\src\univ\renderer.cpp
+$(OBJS)\corelib_rendcmn.obj :  .AUTODEPEND ..\src\common\rendcmn.cpp

        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif

-!endif

 
 !ifeq USE_GUI 1
 
 !ifeq USE_GUI 1

-!ifeq WXUNIV 0

 $(OBJS)\corelib_renderer.obj :  .AUTODEPEND ..\src\msw\renderer.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\corelib_renderg.obj :  .AUTODEPEND ..\src\generic\renderg.cpp


@@ -5300,11 +5279,6 @@ $(OBJS)\corelib_rgncmn.obj :  .AUTODEPEND ..\src\common\rgncmn.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 
 $(OBJS)\corelib_scrarrow.obj :  .AUTODEPEND ..\src\univ\scrarrow.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 


@@ -5378,11 +5352,6 @@ $(OBJS)\corelib_spinctlg.obj :  .AUTODEPEND ..\src\generic\spinctlg.cpp
 $(OBJS)\corelib_spinctrl.obj :  .AUTODEPEND ..\src\msw\spinctrl.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_splitter.obj :  .AUTODEPEND ..\src\generic\splitter.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -5472,16 +5441,6 @@ $(OBJS)\corelib_tabctrl.obj :  .AUTODEPEND ..\src\msw\tabctrl.cpp
 $(OBJS)\corelib_tabg.obj :  .AUTODEPEND ..\src\generic\tabg.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(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) $<
 
 $(OBJS)\corelib_tbar95.obj :  .AUTODEPEND ..\src\msw\tbar95.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 


@@ -5535,11 +5494,6 @@ $(OBJS)\corelib_timercmn.obj :  .AUTODEPEND ..\src\common\timercmn.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_tipwin.obj :  .AUTODEPEND ..\src\generic\tipwin.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -5592,8 +5546,10 @@ $(OBJS)\corelib_uuid.obj :  .AUTODEPEND ..\src\msw\ole\uuid.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1

 $(OBJS)\corelib_uxtheme.obj :  .AUTODEPEND ..\src\msw\uxtheme.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\corelib_valgen.obj :  .AUTODEPEND ..\src\common\valgen.cpp


@@ -5623,11 +5579,6 @@ $(OBJS)\corelib_vscroll.obj :  .AUTODEPEND ..\src\generic\vscroll.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 
 $(OBJS)\corelib_win32.obj :  .AUTODEPEND ..\src\univ\themes\win32.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 


@@ -5644,11 +5595,6 @@ $(OBJS)\corelib_window.obj :  .AUTODEPEND ..\src\msw\window.cpp
 $(OBJS)\corelib_winuniv.obj :  .AUTODEPEND ..\src\univ\winuniv.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_xpmdecod.obj :  .AUTODEPEND ..\src\common\xpmdecod.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -5905,10 +5851,8 @@ $(OBJS)\monodll_button.obj :  .AUTODEPEND ..\src\msw\button.cpp
 !endif
 !endif
 
 !endif
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\src\generic\calctrl.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_caret.obj :  .AUTODEPEND ..\src\msw\caret.cpp


@@ -6056,6 +6000,9 @@ $(OBJS)\monodll_ctrlcmn.obj :  .AUTODEPEND ..\src\common\ctrlcmn.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_ctrlsub.obj :  .AUTODEPEND ..\src\common\ctrlsub.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -6090,10 +6037,8 @@ $(OBJS)\monodll_datstrm.obj :  .AUTODEPEND ..\src\common\datstrm.cpp
 $(OBJS)\monodll_db.obj :  .AUTODEPEND ..\src\common\db.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(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) $<
 $(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) $<
 
 $(OBJS)\monodll_dbtable.obj :  .AUTODEPEND ..\src\common\dbtable.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -6108,10 +6053,8 @@ $(OBJS)\monodll_dcbase.obj :  .AUTODEPEND ..\src\common\dcbase.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monodll_dcbuffer.obj :  .AUTODEPEND ..\src\generic\dcbuffer.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_dcclient.obj :  .AUTODEPEND ..\src\msw\dcclient.cpp


@@ -6419,20 +6362,14 @@ $(OBJS)\monodll_gifdecod.obj :  .AUTODEPEND ..\src\common\gifdecod.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monodll_grid.obj :  .AUTODEPEND ..\src\generic\grid.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(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) $<
 $(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) $<
 $(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) $<
 
 $(OBJS)\monodll_gsocket.obj :  .AUTODEPEND ..\src\msw\gsocket.c
        $(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $<


@@ -6468,10 +6405,8 @@ $(OBJS)\monodll_helpctrl.obj :  .AUTODEPEND ..\src\html\helpctrl.cpp
 $(OBJS)\monodll_helpdata.obj :  .AUTODEPEND ..\src\html\helpdata.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(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) $<
 $(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) $<
 
 $(OBJS)\monodll_helpfrm.obj :  .AUTODEPEND ..\src\html\helpfrm.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -6607,20 +6542,16 @@ $(OBJS)\monodll_intl.obj :  .AUTODEPEND ..\src\common\intl.cpp
 $(OBJS)\monodll_ipcbase.obj :  .AUTODEPEND ..\src\common\ipcbase.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(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) $<
 $(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_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) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_lboxcmn.obj :  .AUTODEPEND ..\src\common\lboxcmn.cpp


@@ -6922,18 +6853,14 @@ $(OBJS)\monodll_registry.obj :  .AUTODEPEND ..\src\msw\registry.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 !ifeq USE_GUI 1
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 !ifeq USE_GUI 1

-!ifeq WXUNIV 1
-$(OBJS)\monodll_renderer.obj :  .AUTODEPEND ..\src\univ\renderer.cpp
+$(OBJS)\monodll_rendcmn.obj :  .AUTODEPEND ..\src\common\rendcmn.cpp

        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif

-!endif

 
 !ifeq USE_GUI 1
 
 !ifeq USE_GUI 1

-!ifeq WXUNIV 0

 $(OBJS)\monodll_renderer.obj :  .AUTODEPEND ..\src\msw\renderer.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_renderg.obj :  .AUTODEPEND ..\src\generic\renderg.cpp


@@ -6945,10 +6872,8 @@ $(OBJS)\monodll_rgncmn.obj :  .AUTODEPEND ..\src\common\rgncmn.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\src\generic\sashwin.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(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) $<
 
 $(OBJS)\monodll_sckaddr.obj :  .AUTODEPEND ..\src\common\sckaddr.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -7041,10 +6966,8 @@ $(OBJS)\monodll_spinctlg.obj :  .AUTODEPEND ..\src\generic\spinctlg.cpp
 $(OBJS)\monodll_spinctrl.obj :  .AUTODEPEND ..\src\msw\spinctrl.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(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) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_splitter.obj :  .AUTODEPEND ..\src\generic\splitter.cpp


@@ -7150,15 +7073,11 @@ $(OBJS)\monodll_tabctrl.obj :  .AUTODEPEND ..\src\msw\tabctrl.cpp
 $(OBJS)\monodll_tabg.obj :  .AUTODEPEND ..\src\generic\tabg.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(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) $<
 $(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) $<
 $(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) $<
 
 $(OBJS)\monodll_tbar95.obj :  .AUTODEPEND ..\src\msw\tbar95.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -7222,10 +7141,8 @@ $(OBJS)\monodll_timercmn.obj :  .AUTODEPEND ..\src\common\timercmn.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\src\generic\tipdlg.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_tipwin.obj :  .AUTODEPEND ..\src\generic\tipwin.cpp


@@ -7297,8 +7214,10 @@ $(OBJS)\monodll_uuid.obj :  .AUTODEPEND ..\src\msw\ole\uuid.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1

 $(OBJS)\monodll_uxtheme.obj :  .AUTODEPEND ..\src\msw\uxtheme.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_valgen.obj :  .AUTODEPEND ..\src\common\valgen.cpp


@@ -7331,10 +7250,8 @@ $(OBJS)\monodll_vscroll.obj :  .AUTODEPEND ..\src\generic\vscroll.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monodll_wave.obj :  .AUTODEPEND ..\src\msw\wave.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 $(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) $<
 
 $(OBJS)\monodll_wfstream.obj :  .AUTODEPEND ..\src\common\wfstream.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -7358,10 +7275,8 @@ $(OBJS)\monodll_winpars.obj :  .AUTODEPEND ..\src\html\winpars.cpp
 $(OBJS)\monodll_winuniv.obj :  .AUTODEPEND ..\src\univ\winuniv.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(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) $<
 $(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) $<
 
 $(OBJS)\monodll_wxchar.obj :  .AUTODEPEND ..\src\common\wxchar.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -7481,10 +7396,8 @@ $(OBJS)\monolib_button.obj :  .AUTODEPEND ..\src\msw\button.cpp
 !endif
 !endif
 
 !endif
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\src\generic\calctrl.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_caret.obj :  .AUTODEPEND ..\src\msw\caret.cpp


@@ -7632,6 +7545,9 @@ $(OBJS)\monolib_ctrlcmn.obj :  .AUTODEPEND ..\src\common\ctrlcmn.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(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) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_ctrlsub.obj :  .AUTODEPEND ..\src\common\ctrlsub.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -7666,10 +7582,8 @@ $(OBJS)\monolib_datstrm.obj :  .AUTODEPEND ..\src\common\datstrm.cpp
 $(OBJS)\monolib_db.obj :  .AUTODEPEND ..\src\common\db.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(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) $<
 $(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) $<
 
 $(OBJS)\monolib_dbtable.obj :  .AUTODEPEND ..\src\common\dbtable.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -7684,10 +7598,8 @@ $(OBJS)\monolib_dcbase.obj :  .AUTODEPEND ..\src\common\dcbase.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monolib_dcbuffer.obj :  .AUTODEPEND ..\src\generic\dcbuffer.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_dcclient.obj :  .AUTODEPEND ..\src\msw\dcclient.cpp


@@ -7995,20 +7907,14 @@ $(OBJS)\monolib_gifdecod.obj :  .AUTODEPEND ..\src\common\gifdecod.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monolib_grid.obj :  .AUTODEPEND ..\src\generic\grid.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(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) $<
 $(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) $<
 $(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) $<
 
 $(OBJS)\monolib_gsocket.obj :  .AUTODEPEND ..\src\msw\gsocket.c
        $(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $<


@@ -8044,10 +7950,8 @@ $(OBJS)\monolib_helpctrl.obj :  .AUTODEPEND ..\src\html\helpctrl.cpp
 $(OBJS)\monolib_helpdata.obj :  .AUTODEPEND ..\src\html\helpdata.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(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) $<
 $(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) $<
 
 $(OBJS)\monolib_helpfrm.obj :  .AUTODEPEND ..\src\html\helpfrm.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -8183,20 +8087,16 @@ $(OBJS)\monolib_intl.obj :  .AUTODEPEND ..\src\common\intl.cpp
 $(OBJS)\monolib_ipcbase.obj :  .AUTODEPEND ..\src\common\ipcbase.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(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) $<
 $(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_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) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_lboxcmn.obj :  .AUTODEPEND ..\src\common\lboxcmn.cpp


@@ -8498,18 +8398,14 @@ $(OBJS)\monolib_registry.obj :  .AUTODEPEND ..\src\msw\registry.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 !ifeq USE_GUI 1
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 !ifeq USE_GUI 1

-!ifeq WXUNIV 1
-$(OBJS)\monolib_renderer.obj :  .AUTODEPEND ..\src\univ\renderer.cpp
+$(OBJS)\monolib_rendcmn.obj :  .AUTODEPEND ..\src\common\rendcmn.cpp

        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif

-!endif

 
 !ifeq USE_GUI 1
 
 !ifeq USE_GUI 1

-!ifeq WXUNIV 0

 $(OBJS)\monolib_renderer.obj :  .AUTODEPEND ..\src\msw\renderer.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_renderg.obj :  .AUTODEPEND ..\src\generic\renderg.cpp


@@ -8521,10 +8417,8 @@ $(OBJS)\monolib_rgncmn.obj :  .AUTODEPEND ..\src\common\rgncmn.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\src\generic\sashwin.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(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) $<
 
 $(OBJS)\monolib_sckaddr.obj :  .AUTODEPEND ..\src\common\sckaddr.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -8617,10 +8511,8 @@ $(OBJS)\monolib_spinctlg.obj :  .AUTODEPEND ..\src\generic\spinctlg.cpp
 $(OBJS)\monolib_spinctrl.obj :  .AUTODEPEND ..\src\msw\spinctrl.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(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) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_splitter.obj :  .AUTODEPEND ..\src\generic\splitter.cpp


@@ -8726,15 +8618,11 @@ $(OBJS)\monolib_tabctrl.obj :  .AUTODEPEND ..\src\msw\tabctrl.cpp
 $(OBJS)\monolib_tabg.obj :  .AUTODEPEND ..\src\generic\tabg.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(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) $<
 $(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) $<
 $(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) $<
 
 $(OBJS)\monolib_tbar95.obj :  .AUTODEPEND ..\src\msw\tbar95.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -8798,10 +8686,8 @@ $(OBJS)\monolib_timercmn.obj :  .AUTODEPEND ..\src\common\timercmn.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\src\generic\tipdlg.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_tipwin.obj :  .AUTODEPEND ..\src\generic\tipwin.cpp


@@ -8873,8 +8759,10 @@ $(OBJS)\monolib_uuid.obj :  .AUTODEPEND ..\src\msw\ole\uuid.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1

 $(OBJS)\monolib_uxtheme.obj :  .AUTODEPEND ..\src\msw\uxtheme.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(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
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_valgen.obj :  .AUTODEPEND ..\src\common\valgen.cpp


@@ -8907,10 +8795,8 @@ $(OBJS)\monolib_vscroll.obj :  .AUTODEPEND ..\src\generic\vscroll.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

-!ifeq USE_GUI 1

 $(OBJS)\monolib_wave.obj :  .AUTODEPEND ..\src\msw\wave.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 $(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) $<
 
 $(OBJS)\monolib_wfstream.obj :  .AUTODEPEND ..\src\common\wfstream.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -8934,10 +8820,8 @@ $(OBJS)\monolib_winpars.obj :  .AUTODEPEND ..\src\html\winpars.cpp
 $(OBJS)\monolib_winuniv.obj :  .AUTODEPEND ..\src\univ\winuniv.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(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) $<
 $(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) $<
 
 $(OBJS)\monolib_wxchar.obj :  .AUTODEPEND ..\src\common\wxchar.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -8956,6 +8840,108 @@ $(OBJS)\monolib_zipstrm.obj :  .AUTODEPEND ..\src\common\zipstrm.cpp
 $(OBJS)\monolib_zstream.obj :  .AUTODEPEND ..\src\common\zstream.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_zstream.obj :  .AUTODEPEND ..\src\common\zstream.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\netdll_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_fs_inet.obj :  .AUTODEPEND ..\src\common\fs_inet.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_ftp.obj :  .AUTODEPEND ..\src\common\ftp.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_gsocket.obj :  .AUTODEPEND ..\src\msw\gsocket.c
+       $(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $<
+
+$(OBJS)\netdll_gsockmsw.obj :  .AUTODEPEND ..\src\msw\gsockmsw.c
+       $(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $<
+
+$(OBJS)\netdll_http.obj :  .AUTODEPEND ..\src\common\http.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_protocol.obj :  .AUTODEPEND ..\src\common\protocol.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_sckaddr.obj :  .AUTODEPEND ..\src\common\sckaddr.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_sckfile.obj :  .AUTODEPEND ..\src\common\sckfile.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_sckipc.obj :  .AUTODEPEND ..\src\common\sckipc.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_sckstrm.obj :  .AUTODEPEND ..\src\common\sckstrm.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_socket.obj :  .AUTODEPEND ..\src\common\socket.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netdll_url.obj :  .AUTODEPEND ..\src\common\url.cpp
+       $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
+
+$(OBJS)\netlib_dummy.obj :  .AUTODEPEND ..\src\msw\dummy.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_fs_inet.obj :  .AUTODEPEND ..\src\common\fs_inet.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_ftp.obj :  .AUTODEPEND ..\src\common\ftp.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_gsocket.obj :  .AUTODEPEND ..\src\msw\gsocket.c
+       $(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $<
+
+$(OBJS)\netlib_gsockmsw.obj :  .AUTODEPEND ..\src\msw\gsockmsw.c
+       $(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $<
+
+$(OBJS)\netlib_http.obj :  .AUTODEPEND ..\src\common\http.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_protocol.obj :  .AUTODEPEND ..\src\common\protocol.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_sckaddr.obj :  .AUTODEPEND ..\src\common\sckaddr.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_sckfile.obj :  .AUTODEPEND ..\src\common\sckfile.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_sckipc.obj :  .AUTODEPEND ..\src\common\sckipc.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_sckstrm.obj :  .AUTODEPEND ..\src\common\sckstrm.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(OBJS)\netlib_socket.obj :  .AUTODEPEND ..\src\common\socket.cpp
+       $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
+
+$(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_dbgrid.obj :  .AUTODEPEND ..\src\common\dbgrid.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_dbgrid.obj :  .AUTODEPEND ..\src\common\dbgrid.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) $<
 
 $(OBJS)\wxexpat_xmlparse.obj :  .AUTODEPEND ..\src\expat\lib\xmlparse.c
        $(CC) -zq -fo=$^@ $(WXEXPAT_CFLAGS) $<
 


@@ -9321,12 +9307,42 @@ $(OBJS)\xmllib_xml.obj :  .AUTODEPEND ..\src\xml\xml.cpp
 
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1

-$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll :  $(BASEDLL_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+!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_9)  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

        @%create $(OBJS)\basedll.lbc
        @%append $(OBJS)\basedll.lbc option quiet
        @%append $(OBJS)\basedll.lbc name $^@
        @%append $(OBJS)\basedll.lbc option incremental
        @%create $(OBJS)\basedll.lbc
        @%append $(OBJS)\basedll.lbc option quiet
        @%append $(OBJS)\basedll.lbc name $^@
        @%append $(OBJS)\basedll.lbc option incremental

-       @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGFLAG_5)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_9)  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
        @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


@@ -9362,9 +9378,18 @@ clean : .SYMBOLIC
        -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib

+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
+       -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib

        -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)_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)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.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
        -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


@@ -9383,7 +9408,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 option quiet
        @%append $(OBJS)\coredll.lbc name $^@
        @%append $(OBJS)\coredll.lbc option incremental

-       @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGFLAG_5)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_9)  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
        @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


@@ -9413,7 +9438,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 option quiet
        @%append $(OBJS)\gldll.lbc name $^@
        @%append $(OBJS)\gldll.lbc option incremental

-       @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGFLAG_5)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_9)  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
        @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


@@ -9443,7 +9468,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 option quiet
        @%append $(OBJS)\htmldll.lbc name $^@
        @%append $(OBJS)\htmldll.lbc option incremental

-       @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_5)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_9)  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
        @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


@@ -9478,9 +9503,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 option quiet
        @%append $(OBJS)\monodll.lbc name $^@
        @%append $(OBJS)\monodll.lbc option incremental

-       @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGFLAG_5)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_9)  libpath $(LIBDIRNAME)

        @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
        @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
        @%append $(OBJS)\monodll.lbc
        @%append $(OBJS)\monodll.lbc system nt_dll
        wlink @$(OBJS)\monodll.lbc


@@ -9500,6 +9525,66 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib :
 ..\include\wx\msw\setup.h :  
        if not exist ..\include\wx\msw\setup.h copy ..\include\wx\msw\setup0.h ..\include\wx\msw\setup.h
 
 ..\include\wx\msw\setup.h :  
        if not exist ..\include\wx\msw\setup.h copy ..\include\wx\msw\setup0.h ..\include\wx\msw\setup.h
 

+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll :  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
+       @%create $(OBJS)\netdll.lbc
+       @%append $(OBJS)\netdll.lbc option quiet
+       @%append $(OBJS)\netdll.lbc name $^@
+       @%append $(OBJS)\netdll.lbc option incremental
+       @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_9)  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
+       @%append $(OBJS)\netdll.lbc system nt_dll
+       wlink @$(OBJS)\netdll.lbc
+       wlib -q -n -b $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +$^@
+!endif
+!endif
+
+!ifeq MONOLITHIC 0
+!ifeq SHARED 0
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib :  $(NETLIB_OBJECTS)
+       @%create $(OBJS)\netlib.lbc
+       @for %i in ($(NETLIB_OBJECTS)) do @%append $(OBJS)\netlib.lbc +%i
+       wlib -q -p2048 -n -b $^@ @$(OBJS)\netlib.lbc
+!endif
+!endif
+
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+!ifeq USE_ODBC 1
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(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 $(__advdll___depname) $(__coredll___depname) $(__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_9)  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)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.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)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.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)_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
 
 $(LIBDIRNAME)\wx\setup.h :  
        if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
 


@@ -9543,12 +9628,12 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib :  $(WXZLIB_OBJECTS)
 
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1

-$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll :  $(XMLDLL_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
+$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll :  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)

        @%create $(OBJS)\xmldll.lbc
        @%append $(OBJS)\xmldll.lbc option quiet
        @%append $(OBJS)\xmldll.lbc name $^@
        @%append $(OBJS)\xmldll.lbc option incremental
        @%create $(OBJS)\xmldll.lbc
        @%append $(OBJS)\xmldll.lbc option quiet
        @%append $(OBJS)\xmldll.lbc name $^@
        @%append $(OBJS)\xmldll.lbc option incremental

-       @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_5)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_9)  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
        @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