Use generic collapsible pane for wxOS2.

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

diff --git a/build/os2/makefile.wat b/build/os2/makefile.wat
index 787b535e8b31ae690506cdf7e4625bae0585afc8..2d62f635d470c9833643258f2032121694c5d203 100644 (file)
--- a/build/os2/makefile.wat
+++ b/build/os2/makefile.wat
@@ -122,8 +122,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_debugrpt.obj &
        $(OBJS)\monodll_dbgrptg.obj &
        $(OBJS)\monodll_dbgrid.obj &
        $(OBJS)\monodll_debugrpt.obj &
        $(OBJS)\monodll_dbgrptg.obj &
        $(OBJS)\monodll_dbgrid.obj &

-       $(OBJS)\monodll_xh_bmpbt.obj &
+       $(OBJS)\monodll_xh_animatctrl.obj &

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

+       $(OBJS)\monodll_xh_bmpcbox.obj &
+       $(OBJS)\monodll_xh_bmpbt.obj &

        $(OBJS)\monodll_xh_bttn.obj &
        $(OBJS)\monodll_xh_cald.obj &
        $(OBJS)\monodll_xh_chckb.obj &
        $(OBJS)\monodll_xh_bttn.obj &
        $(OBJS)\monodll_xh_cald.obj &
        $(OBJS)\monodll_xh_chckb.obj &


@@ -155,6 +157,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_xh_radbx.obj &
        $(OBJS)\monodll_xh_scrol.obj &
        $(OBJS)\monodll_xh_scwin.obj &
        $(OBJS)\monodll_xh_radbx.obj &
        $(OBJS)\monodll_xh_scrol.obj &
        $(OBJS)\monodll_xh_scwin.obj &

+       $(OBJS)\monodll_xh_htmllbox.obj &

        $(OBJS)\monodll_xh_sizer.obj &
        $(OBJS)\monodll_xh_slidr.obj &
        $(OBJS)\monodll_xh_spin.obj &
        $(OBJS)\monodll_xh_sizer.obj &
        $(OBJS)\monodll_xh_slidr.obj &
        $(OBJS)\monodll_xh_spin.obj &


@@ -176,17 +179,23 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_framemanager.obj &
        $(OBJS)\monodll_dockart.obj &
        $(OBJS)\monodll_floatpane.obj &
        $(OBJS)\monodll_framemanager.obj &
        $(OBJS)\monodll_dockart.obj &
        $(OBJS)\monodll_floatpane.obj &

+       $(OBJS)\monodll_auibook.obj &
+       $(OBJS)\monodll_tabmdi.obj &

        $(OBJS)\monodll_richtextctrl.obj &
        $(OBJS)\monodll_richtextbuffer.obj &
        $(OBJS)\monodll_richtextstyles.obj &
        $(OBJS)\monodll_richtextxml.obj &
        $(OBJS)\monodll_richtextctrl.obj &
        $(OBJS)\monodll_richtextbuffer.obj &
        $(OBJS)\monodll_richtextstyles.obj &
        $(OBJS)\monodll_richtextxml.obj &

-       $(OBJS)\monodll_richtexthtml.obj
+       $(OBJS)\monodll_richtexthtml.obj &
+       $(OBJS)\monodll_richtextformatdlg.obj &
+       $(OBJS)\monodll_richtextsymboldlg.obj &
+       $(OBJS)\monodll_richtextstyledlg.obj

 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_caret.obj &
 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_caret.obj &

+       $(OBJS)\monodll_collpaneg.obj &

        $(OBJS)\monodll_colrdlgg.obj &
        $(OBJS)\monodll_dirdlgg.obj &
        $(OBJS)\monodll_fdrepdlg.obj &
        $(OBJS)\monodll_colrdlgg.obj &
        $(OBJS)\monodll_dirdlgg.obj &
        $(OBJS)\monodll_fdrepdlg.obj &


@@ -227,7 +236,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_frame.obj &
        $(OBJS)\monodll_gauge.obj &
        $(OBJS)\monodll_gdiimage.obj &
        $(OBJS)\monodll_frame.obj &
        $(OBJS)\monodll_gauge.obj &
        $(OBJS)\monodll_gdiimage.obj &

-       $(OBJS)\monodll_gdiobj.obj &

        $(OBJS)\monodll_gsockpm.obj &
        $(OBJS)\monodll_helpwin.obj &
        $(OBJS)\monodll_icon.obj &
        $(OBJS)\monodll_gsockpm.obj &
        $(OBJS)\monodll_helpwin.obj &
        $(OBJS)\monodll_icon.obj &


@@ -267,6 +275,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_utilsgui.obj &
        $(OBJS)\monodll_window.obj &
        $(OBJS)\monodll_accesscmn.obj &
        $(OBJS)\monodll_utilsgui.obj &
        $(OBJS)\monodll_window.obj &
        $(OBJS)\monodll_accesscmn.obj &

+       $(OBJS)\monodll_anidecod.obj &

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


@@ -285,6 +294,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_ctrlsub.obj &
        $(OBJS)\monodll_datacmn.obj &
        $(OBJS)\monodll_dcbase.obj &
        $(OBJS)\monodll_ctrlsub.obj &
        $(OBJS)\monodll_datacmn.obj &
        $(OBJS)\monodll_dcbase.obj &

+       $(OBJS)\monodll_dcbufcmn.obj &

        $(OBJS)\monodll_dlgcmn.obj &
        $(OBJS)\monodll_dndcmn.obj &
        $(OBJS)\monodll_dobjcmn.obj &
        $(OBJS)\monodll_dlgcmn.obj &
        $(OBJS)\monodll_dndcmn.obj &
        $(OBJS)\monodll_dobjcmn.obj &


@@ -307,6 +317,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &
        $(OBJS)\monodll_gifdecod.obj &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &
        $(OBJS)\monodll_gifdecod.obj &

+       $(OBJS)\monodll_graphcmn.obj &

        $(OBJS)\monodll_helpbase.obj &
        $(OBJS)\monodll_iconbndl.obj &
        $(OBJS)\monodll_imagall.obj &
        $(OBJS)\monodll_helpbase.obj &
        $(OBJS)\monodll_iconbndl.obj &
        $(OBJS)\monodll_imagall.obj &


@@ -323,6 +334,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagxpm.obj &
        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &
        $(OBJS)\monodll_imagxpm.obj &
        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &

+       $(OBJS)\monodll_listctrlcmn.obj &

        $(OBJS)\monodll_matrix.obj &
        $(OBJS)\monodll_menucmn.obj &
        $(OBJS)\monodll_nbkbase.obj &
        $(OBJS)\monodll_matrix.obj &
        $(OBJS)\monodll_menucmn.obj &
        $(OBJS)\monodll_nbkbase.obj &


@@ -383,12 +395,12 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_accel.obj &
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_accel.obj &

+       $(OBJS)\monodll_collpaneg.obj &

        $(OBJS)\monodll_colrdlgg.obj &
        $(OBJS)\monodll_dirdlgg.obj &
        $(OBJS)\monodll_fdrepdlg.obj &
        $(OBJS)\monodll_filedlgg.obj &
        $(OBJS)\monodll_fontdlgg.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_listctrl.obj &
        $(OBJS)\monodll_mdig.obj &
        $(OBJS)\monodll_msgdlgg.obj &


@@ -423,6 +435,7 @@ ____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_stdrend.obj &

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


@@ -431,8 +444,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_winuniv.obj &
        $(OBJS)\monodll_gtk.obj &
        $(OBJS)\monodll_metal.obj &
        $(OBJS)\monodll_winuniv.obj &
        $(OBJS)\monodll_gtk.obj &
        $(OBJS)\monodll_metal.obj &

+       $(OBJS)\monodll_mono.obj &

        $(OBJS)\monodll_win32.obj &
        $(OBJS)\monodll_accesscmn.obj &
        $(OBJS)\monodll_win32.obj &
        $(OBJS)\monodll_accesscmn.obj &

+       $(OBJS)\monodll_anidecod.obj &

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


@@ -451,6 +466,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_ctrlsub.obj &
        $(OBJS)\monodll_datacmn.obj &
        $(OBJS)\monodll_dcbase.obj &
        $(OBJS)\monodll_ctrlsub.obj &
        $(OBJS)\monodll_datacmn.obj &
        $(OBJS)\monodll_dcbase.obj &

+       $(OBJS)\monodll_dcbufcmn.obj &

        $(OBJS)\monodll_dlgcmn.obj &
        $(OBJS)\monodll_dndcmn.obj &
        $(OBJS)\monodll_dobjcmn.obj &
        $(OBJS)\monodll_dlgcmn.obj &
        $(OBJS)\monodll_dndcmn.obj &
        $(OBJS)\monodll_dobjcmn.obj &


@@ -473,6 +489,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &
        $(OBJS)\monodll_gifdecod.obj &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &
        $(OBJS)\monodll_gifdecod.obj &

+       $(OBJS)\monodll_graphcmn.obj &

        $(OBJS)\monodll_helpbase.obj &
        $(OBJS)\monodll_iconbndl.obj &
        $(OBJS)\monodll_imagall.obj &
        $(OBJS)\monodll_helpbase.obj &
        $(OBJS)\monodll_iconbndl.obj &
        $(OBJS)\monodll_imagall.obj &


@@ -489,6 +506,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagxpm.obj &
        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &
        $(OBJS)\monodll_imagxpm.obj &
        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &

+       $(OBJS)\monodll_listctrlcmn.obj &

        $(OBJS)\monodll_matrix.obj &
        $(OBJS)\monodll_menucmn.obj &
        $(OBJS)\monodll_nbkbase.obj &
        $(OBJS)\monodll_matrix.obj &
        $(OBJS)\monodll_menucmn.obj &
        $(OBJS)\monodll_nbkbase.obj &


@@ -548,7 +566,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &

+       $(OBJS)\monodll_animatecmn.obj &

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

+       $(OBJS)\monodll_aboutdlgg.obj &
+       $(OBJS)\monodll_bmpcboxg.obj &

        $(OBJS)\monodll_calctrl.obj &
        $(OBJS)\monodll_datavgen.obj &
        $(OBJS)\monodll_datectlg.obj &
        $(OBJS)\monodll_calctrl.obj &
        $(OBJS)\monodll_datavgen.obj &
        $(OBJS)\monodll_datectlg.obj &


@@ -564,12 +585,16 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_splash.obj &
        $(OBJS)\monodll_tipdlg.obj &
        $(OBJS)\monodll_wizard.obj &
        $(OBJS)\monodll_splash.obj &
        $(OBJS)\monodll_tipdlg.obj &
        $(OBJS)\monodll_wizard.obj &

+       $(OBJS)\monodll_animateg.obj &

        $(OBJS)\monodll_joystick.obj &
        $(OBJS)\monodll_sound.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_joystick.obj &
        $(OBJS)\monodll_sound.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &

+       $(OBJS)\monodll_animatecmn.obj &

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

+       $(OBJS)\monodll_aboutdlgg.obj &
+       $(OBJS)\monodll_bmpcboxg.obj &

        $(OBJS)\monodll_calctrl.obj &
        $(OBJS)\monodll_datavgen.obj &
        $(OBJS)\monodll_datectlg.obj &
        $(OBJS)\monodll_calctrl.obj &
        $(OBJS)\monodll_datavgen.obj &
        $(OBJS)\monodll_datectlg.obj &


@@ -585,6 +610,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_splash.obj &
        $(OBJS)\monodll_tipdlg.obj &
        $(OBJS)\monodll_wizard.obj &
        $(OBJS)\monodll_splash.obj &
        $(OBJS)\monodll_tipdlg.obj &
        $(OBJS)\monodll_wizard.obj &

+       $(OBJS)\monodll_animateg.obj &

        $(OBJS)\monodll_joystick.obj &
        $(OBJS)\monodll_sound.obj
 !endif
        $(OBJS)\monodll_joystick.obj &
        $(OBJS)\monodll_sound.obj
 !endif


@@ -629,8 +655,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_debugrpt.obj &
        $(OBJS)\monolib_dbgrptg.obj &
        $(OBJS)\monolib_dbgrid.obj &
        $(OBJS)\monolib_debugrpt.obj &
        $(OBJS)\monolib_dbgrptg.obj &
        $(OBJS)\monolib_dbgrid.obj &

-       $(OBJS)\monolib_xh_bmpbt.obj &
+       $(OBJS)\monolib_xh_animatctrl.obj &

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

+       $(OBJS)\monolib_xh_bmpcbox.obj &
+       $(OBJS)\monolib_xh_bmpbt.obj &

        $(OBJS)\monolib_xh_bttn.obj &
        $(OBJS)\monolib_xh_cald.obj &
        $(OBJS)\monolib_xh_chckb.obj &
        $(OBJS)\monolib_xh_bttn.obj &
        $(OBJS)\monolib_xh_cald.obj &
        $(OBJS)\monolib_xh_chckb.obj &


@@ -662,6 +690,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_xh_radbx.obj &
        $(OBJS)\monolib_xh_scrol.obj &
        $(OBJS)\monolib_xh_scwin.obj &
        $(OBJS)\monolib_xh_radbx.obj &
        $(OBJS)\monolib_xh_scrol.obj &
        $(OBJS)\monolib_xh_scwin.obj &

+       $(OBJS)\monolib_xh_htmllbox.obj &

        $(OBJS)\monolib_xh_sizer.obj &
        $(OBJS)\monolib_xh_slidr.obj &
        $(OBJS)\monolib_xh_spin.obj &
        $(OBJS)\monolib_xh_sizer.obj &
        $(OBJS)\monolib_xh_slidr.obj &
        $(OBJS)\monolib_xh_spin.obj &


@@ -683,17 +712,23 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_framemanager.obj &
        $(OBJS)\monolib_dockart.obj &
        $(OBJS)\monolib_floatpane.obj &
        $(OBJS)\monolib_framemanager.obj &
        $(OBJS)\monolib_dockart.obj &
        $(OBJS)\monolib_floatpane.obj &

+       $(OBJS)\monolib_auibook.obj &
+       $(OBJS)\monolib_tabmdi.obj &

        $(OBJS)\monolib_richtextctrl.obj &
        $(OBJS)\monolib_richtextbuffer.obj &
        $(OBJS)\monolib_richtextstyles.obj &
        $(OBJS)\monolib_richtextxml.obj &
        $(OBJS)\monolib_richtextctrl.obj &
        $(OBJS)\monolib_richtextbuffer.obj &
        $(OBJS)\monolib_richtextstyles.obj &
        $(OBJS)\monolib_richtextxml.obj &

-       $(OBJS)\monolib_richtexthtml.obj
+       $(OBJS)\monolib_richtexthtml.obj &
+       $(OBJS)\monolib_richtextformatdlg.obj &
+       $(OBJS)\monolib_richtextsymboldlg.obj &
+       $(OBJS)\monolib_richtextstyledlg.obj

 !endif
 ____CORE_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_caret.obj &
 !endif
 ____CORE_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_caret.obj &

+       $(OBJS)\monolib_collpaneg.obj &

        $(OBJS)\monolib_colrdlgg.obj &
        $(OBJS)\monolib_dirdlgg.obj &
        $(OBJS)\monolib_fdrepdlg.obj &
        $(OBJS)\monolib_colrdlgg.obj &
        $(OBJS)\monolib_dirdlgg.obj &
        $(OBJS)\monolib_fdrepdlg.obj &


@@ -734,7 +769,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_frame.obj &
        $(OBJS)\monolib_gauge.obj &
        $(OBJS)\monolib_gdiimage.obj &
        $(OBJS)\monolib_frame.obj &
        $(OBJS)\monolib_gauge.obj &
        $(OBJS)\monolib_gdiimage.obj &

-       $(OBJS)\monolib_gdiobj.obj &

        $(OBJS)\monolib_gsockpm.obj &
        $(OBJS)\monolib_helpwin.obj &
        $(OBJS)\monolib_icon.obj &
        $(OBJS)\monolib_gsockpm.obj &
        $(OBJS)\monolib_helpwin.obj &
        $(OBJS)\monolib_icon.obj &


@@ -774,6 +808,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_window.obj &
        $(OBJS)\monolib_accesscmn.obj &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_window.obj &
        $(OBJS)\monolib_accesscmn.obj &

+       $(OBJS)\monolib_anidecod.obj &

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


@@ -792,6 +827,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_ctrlsub.obj &
        $(OBJS)\monolib_datacmn.obj &
        $(OBJS)\monolib_dcbase.obj &
        $(OBJS)\monolib_ctrlsub.obj &
        $(OBJS)\monolib_datacmn.obj &
        $(OBJS)\monolib_dcbase.obj &

+       $(OBJS)\monolib_dcbufcmn.obj &

        $(OBJS)\monolib_dlgcmn.obj &
        $(OBJS)\monolib_dndcmn.obj &
        $(OBJS)\monolib_dobjcmn.obj &
        $(OBJS)\monolib_dlgcmn.obj &
        $(OBJS)\monolib_dndcmn.obj &
        $(OBJS)\monolib_dobjcmn.obj &


@@ -814,6 +850,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &
        $(OBJS)\monolib_gifdecod.obj &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &
        $(OBJS)\monolib_gifdecod.obj &

+       $(OBJS)\monolib_graphcmn.obj &

        $(OBJS)\monolib_helpbase.obj &
        $(OBJS)\monolib_iconbndl.obj &
        $(OBJS)\monolib_imagall.obj &
        $(OBJS)\monolib_helpbase.obj &
        $(OBJS)\monolib_iconbndl.obj &
        $(OBJS)\monolib_imagall.obj &


@@ -830,6 +867,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_imagxpm.obj &
        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &
        $(OBJS)\monolib_imagxpm.obj &
        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &

+       $(OBJS)\monolib_listctrlcmn.obj &

        $(OBJS)\monolib_matrix.obj &
        $(OBJS)\monolib_menucmn.obj &
        $(OBJS)\monolib_nbkbase.obj &
        $(OBJS)\monolib_matrix.obj &
        $(OBJS)\monolib_menucmn.obj &
        $(OBJS)\monolib_nbkbase.obj &


@@ -890,12 +928,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_accel.obj &
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_accel.obj &

+       $(OBJS)\monolib_collpaneg.obj &

        $(OBJS)\monolib_colrdlgg.obj &
        $(OBJS)\monolib_dirdlgg.obj &
        $(OBJS)\monolib_fdrepdlg.obj &
        $(OBJS)\monolib_filedlgg.obj &
        $(OBJS)\monolib_fontdlgg.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_listctrl.obj &
        $(OBJS)\monolib_mdig.obj &
        $(OBJS)\monolib_msgdlgg.obj &


@@ -930,6 +968,7 @@ ____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_stdrend.obj &

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


@@ -938,8 +977,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_winuniv.obj &
        $(OBJS)\monolib_gtk.obj &
        $(OBJS)\monolib_metal.obj &
        $(OBJS)\monolib_winuniv.obj &
        $(OBJS)\monolib_gtk.obj &
        $(OBJS)\monolib_metal.obj &

+       $(OBJS)\monolib_mono.obj &

        $(OBJS)\monolib_win32.obj &
        $(OBJS)\monolib_accesscmn.obj &
        $(OBJS)\monolib_win32.obj &
        $(OBJS)\monolib_accesscmn.obj &

+       $(OBJS)\monolib_anidecod.obj &

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


@@ -958,6 +999,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_ctrlsub.obj &
        $(OBJS)\monolib_datacmn.obj &
        $(OBJS)\monolib_dcbase.obj &
        $(OBJS)\monolib_ctrlsub.obj &
        $(OBJS)\monolib_datacmn.obj &
        $(OBJS)\monolib_dcbase.obj &

+       $(OBJS)\monolib_dcbufcmn.obj &

        $(OBJS)\monolib_dlgcmn.obj &
        $(OBJS)\monolib_dndcmn.obj &
        $(OBJS)\monolib_dobjcmn.obj &
        $(OBJS)\monolib_dlgcmn.obj &
        $(OBJS)\monolib_dndcmn.obj &
        $(OBJS)\monolib_dobjcmn.obj &


@@ -980,6 +1022,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &
        $(OBJS)\monolib_gifdecod.obj &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &
        $(OBJS)\monolib_gifdecod.obj &

+       $(OBJS)\monolib_graphcmn.obj &

        $(OBJS)\monolib_helpbase.obj &
        $(OBJS)\monolib_iconbndl.obj &
        $(OBJS)\monolib_imagall.obj &
        $(OBJS)\monolib_helpbase.obj &
        $(OBJS)\monolib_iconbndl.obj &
        $(OBJS)\monolib_imagall.obj &


@@ -996,6 +1039,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_imagxpm.obj &
        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &
        $(OBJS)\monolib_imagxpm.obj &
        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &

+       $(OBJS)\monolib_listctrlcmn.obj &

        $(OBJS)\monolib_matrix.obj &
        $(OBJS)\monolib_menucmn.obj &
        $(OBJS)\monolib_nbkbase.obj &
        $(OBJS)\monolib_matrix.obj &
        $(OBJS)\monolib_menucmn.obj &
        $(OBJS)\monolib_nbkbase.obj &


@@ -1055,7 +1099,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &

+       $(OBJS)\monolib_animatecmn.obj &

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

+       $(OBJS)\monolib_aboutdlgg.obj &
+       $(OBJS)\monolib_bmpcboxg.obj &

        $(OBJS)\monolib_calctrl.obj &
        $(OBJS)\monolib_datavgen.obj &
        $(OBJS)\monolib_datectlg.obj &
        $(OBJS)\monolib_calctrl.obj &
        $(OBJS)\monolib_datavgen.obj &
        $(OBJS)\monolib_datectlg.obj &


@@ -1071,12 +1118,16 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_splash.obj &
        $(OBJS)\monolib_tipdlg.obj &
        $(OBJS)\monolib_wizard.obj &
        $(OBJS)\monolib_splash.obj &
        $(OBJS)\monolib_tipdlg.obj &
        $(OBJS)\monolib_wizard.obj &

+       $(OBJS)\monolib_animateg.obj &

        $(OBJS)\monolib_joystick.obj &
        $(OBJS)\monolib_sound.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_joystick.obj &
        $(OBJS)\monolib_sound.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &

+       $(OBJS)\monolib_animatecmn.obj &

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

+       $(OBJS)\monolib_aboutdlgg.obj &
+       $(OBJS)\monolib_bmpcboxg.obj &

        $(OBJS)\monolib_calctrl.obj &
        $(OBJS)\monolib_datavgen.obj &
        $(OBJS)\monolib_datectlg.obj &
        $(OBJS)\monolib_calctrl.obj &
        $(OBJS)\monolib_datavgen.obj &
        $(OBJS)\monolib_datectlg.obj &


@@ -1092,6 +1143,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_splash.obj &
        $(OBJS)\monolib_tipdlg.obj &
        $(OBJS)\monolib_wizard.obj &
        $(OBJS)\monolib_splash.obj &
        $(OBJS)\monolib_tipdlg.obj &
        $(OBJS)\monolib_wizard.obj &

+       $(OBJS)\monolib_animateg.obj &

        $(OBJS)\monolib_joystick.obj &
        $(OBJS)\monolib_sound.obj
 !endif
        $(OBJS)\monolib_joystick.obj &
        $(OBJS)\monolib_sound.obj
 !endif


@@ -1137,6 +1189,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_caret.obj &
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_caret.obj &

+       $(OBJS)\coredll_collpaneg.obj &

        $(OBJS)\coredll_colrdlgg.obj &
        $(OBJS)\coredll_dirdlgg.obj &
        $(OBJS)\coredll_fdrepdlg.obj &
        $(OBJS)\coredll_colrdlgg.obj &
        $(OBJS)\coredll_dirdlgg.obj &
        $(OBJS)\coredll_fdrepdlg.obj &


@@ -1177,7 +1230,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_frame.obj &
        $(OBJS)\coredll_gauge.obj &
        $(OBJS)\coredll_gdiimage.obj &
        $(OBJS)\coredll_frame.obj &
        $(OBJS)\coredll_gauge.obj &
        $(OBJS)\coredll_gdiimage.obj &

-       $(OBJS)\coredll_gdiobj.obj &

        $(OBJS)\coredll_gsockpm.obj &
        $(OBJS)\coredll_helpwin.obj &
        $(OBJS)\coredll_icon.obj &
        $(OBJS)\coredll_gsockpm.obj &
        $(OBJS)\coredll_helpwin.obj &
        $(OBJS)\coredll_icon.obj &


@@ -1217,6 +1269,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_window.obj &
        $(OBJS)\coredll_accesscmn.obj &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_window.obj &
        $(OBJS)\coredll_accesscmn.obj &

+       $(OBJS)\coredll_anidecod.obj &

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


@@ -1235,6 +1288,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_ctrlsub.obj &
        $(OBJS)\coredll_datacmn.obj &
        $(OBJS)\coredll_dcbase.obj &
        $(OBJS)\coredll_ctrlsub.obj &
        $(OBJS)\coredll_datacmn.obj &
        $(OBJS)\coredll_dcbase.obj &

+       $(OBJS)\coredll_dcbufcmn.obj &

        $(OBJS)\coredll_dlgcmn.obj &
        $(OBJS)\coredll_dndcmn.obj &
        $(OBJS)\coredll_dobjcmn.obj &
        $(OBJS)\coredll_dlgcmn.obj &
        $(OBJS)\coredll_dndcmn.obj &
        $(OBJS)\coredll_dobjcmn.obj &


@@ -1257,6 +1311,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &
        $(OBJS)\coredll_gifdecod.obj &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &
        $(OBJS)\coredll_gifdecod.obj &

+       $(OBJS)\coredll_graphcmn.obj &

        $(OBJS)\coredll_helpbase.obj &
        $(OBJS)\coredll_iconbndl.obj &
        $(OBJS)\coredll_imagall.obj &
        $(OBJS)\coredll_helpbase.obj &
        $(OBJS)\coredll_iconbndl.obj &
        $(OBJS)\coredll_imagall.obj &


@@ -1273,6 +1328,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagxpm.obj &
        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &
        $(OBJS)\coredll_imagxpm.obj &
        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &

+       $(OBJS)\coredll_listctrlcmn.obj &

        $(OBJS)\coredll_matrix.obj &
        $(OBJS)\coredll_menucmn.obj &
        $(OBJS)\coredll_nbkbase.obj &
        $(OBJS)\coredll_matrix.obj &
        $(OBJS)\coredll_menucmn.obj &
        $(OBJS)\coredll_nbkbase.obj &


@@ -1333,12 +1389,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_accel.obj &
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_accel.obj &

+       $(OBJS)\coredll_collpaneg.obj &

        $(OBJS)\coredll_colrdlgg.obj &
        $(OBJS)\coredll_dirdlgg.obj &
        $(OBJS)\coredll_fdrepdlg.obj &
        $(OBJS)\coredll_filedlgg.obj &
        $(OBJS)\coredll_fontdlgg.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_listctrl.obj &
        $(OBJS)\coredll_mdig.obj &
        $(OBJS)\coredll_msgdlgg.obj &


@@ -1373,6 +1429,7 @@ ____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_stdrend.obj &

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


@@ -1381,8 +1438,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_winuniv.obj &
        $(OBJS)\coredll_gtk.obj &
        $(OBJS)\coredll_metal.obj &
        $(OBJS)\coredll_winuniv.obj &
        $(OBJS)\coredll_gtk.obj &
        $(OBJS)\coredll_metal.obj &

+       $(OBJS)\coredll_mono.obj &

        $(OBJS)\coredll_win32.obj &
        $(OBJS)\coredll_accesscmn.obj &
        $(OBJS)\coredll_win32.obj &
        $(OBJS)\coredll_accesscmn.obj &

+       $(OBJS)\coredll_anidecod.obj &

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


@@ -1401,6 +1460,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_ctrlsub.obj &
        $(OBJS)\coredll_datacmn.obj &
        $(OBJS)\coredll_dcbase.obj &
        $(OBJS)\coredll_ctrlsub.obj &
        $(OBJS)\coredll_datacmn.obj &
        $(OBJS)\coredll_dcbase.obj &

+       $(OBJS)\coredll_dcbufcmn.obj &

        $(OBJS)\coredll_dlgcmn.obj &
        $(OBJS)\coredll_dndcmn.obj &
        $(OBJS)\coredll_dobjcmn.obj &
        $(OBJS)\coredll_dlgcmn.obj &
        $(OBJS)\coredll_dndcmn.obj &
        $(OBJS)\coredll_dobjcmn.obj &


@@ -1423,6 +1483,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &
        $(OBJS)\coredll_gifdecod.obj &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &
        $(OBJS)\coredll_gifdecod.obj &

+       $(OBJS)\coredll_graphcmn.obj &

        $(OBJS)\coredll_helpbase.obj &
        $(OBJS)\coredll_iconbndl.obj &
        $(OBJS)\coredll_imagall.obj &
        $(OBJS)\coredll_helpbase.obj &
        $(OBJS)\coredll_iconbndl.obj &
        $(OBJS)\coredll_imagall.obj &


@@ -1439,6 +1500,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagxpm.obj &
        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &
        $(OBJS)\coredll_imagxpm.obj &
        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &

+       $(OBJS)\coredll_listctrlcmn.obj &

        $(OBJS)\coredll_matrix.obj &
        $(OBJS)\coredll_menucmn.obj &
        $(OBJS)\coredll_nbkbase.obj &
        $(OBJS)\coredll_matrix.obj &
        $(OBJS)\coredll_menucmn.obj &
        $(OBJS)\coredll_nbkbase.obj &


@@ -1509,6 +1571,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_caret.obj &
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_caret.obj &

+       $(OBJS)\corelib_collpaneg.obj &

        $(OBJS)\corelib_colrdlgg.obj &
        $(OBJS)\corelib_dirdlgg.obj &
        $(OBJS)\corelib_fdrepdlg.obj &
        $(OBJS)\corelib_colrdlgg.obj &
        $(OBJS)\corelib_dirdlgg.obj &
        $(OBJS)\corelib_fdrepdlg.obj &


@@ -1549,7 +1612,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_frame.obj &
        $(OBJS)\corelib_gauge.obj &
        $(OBJS)\corelib_gdiimage.obj &
        $(OBJS)\corelib_frame.obj &
        $(OBJS)\corelib_gauge.obj &
        $(OBJS)\corelib_gdiimage.obj &

-       $(OBJS)\corelib_gdiobj.obj &

        $(OBJS)\corelib_gsockpm.obj &
        $(OBJS)\corelib_helpwin.obj &
        $(OBJS)\corelib_icon.obj &
        $(OBJS)\corelib_gsockpm.obj &
        $(OBJS)\corelib_helpwin.obj &
        $(OBJS)\corelib_icon.obj &


@@ -1589,6 +1651,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_window.obj &
        $(OBJS)\corelib_accesscmn.obj &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_window.obj &
        $(OBJS)\corelib_accesscmn.obj &

+       $(OBJS)\corelib_anidecod.obj &

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


@@ -1607,6 +1670,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_ctrlsub.obj &
        $(OBJS)\corelib_datacmn.obj &
        $(OBJS)\corelib_dcbase.obj &
        $(OBJS)\corelib_ctrlsub.obj &
        $(OBJS)\corelib_datacmn.obj &
        $(OBJS)\corelib_dcbase.obj &

+       $(OBJS)\corelib_dcbufcmn.obj &

        $(OBJS)\corelib_dlgcmn.obj &
        $(OBJS)\corelib_dndcmn.obj &
        $(OBJS)\corelib_dobjcmn.obj &
        $(OBJS)\corelib_dlgcmn.obj &
        $(OBJS)\corelib_dndcmn.obj &
        $(OBJS)\corelib_dobjcmn.obj &


@@ -1629,6 +1693,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &
        $(OBJS)\corelib_gifdecod.obj &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &
        $(OBJS)\corelib_gifdecod.obj &

+       $(OBJS)\corelib_graphcmn.obj &

        $(OBJS)\corelib_helpbase.obj &
        $(OBJS)\corelib_iconbndl.obj &
        $(OBJS)\corelib_imagall.obj &
        $(OBJS)\corelib_helpbase.obj &
        $(OBJS)\corelib_iconbndl.obj &
        $(OBJS)\corelib_imagall.obj &


@@ -1645,6 +1710,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagxpm.obj &
        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &
        $(OBJS)\corelib_imagxpm.obj &
        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &

+       $(OBJS)\corelib_listctrlcmn.obj &

        $(OBJS)\corelib_matrix.obj &
        $(OBJS)\corelib_menucmn.obj &
        $(OBJS)\corelib_nbkbase.obj &
        $(OBJS)\corelib_matrix.obj &
        $(OBJS)\corelib_menucmn.obj &
        $(OBJS)\corelib_nbkbase.obj &


@@ -1705,12 +1771,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_accel.obj &
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_accel.obj &

+       $(OBJS)\corelib_collpaneg.obj &

        $(OBJS)\corelib_colrdlgg.obj &
        $(OBJS)\corelib_dirdlgg.obj &
        $(OBJS)\corelib_fdrepdlg.obj &
        $(OBJS)\corelib_filedlgg.obj &
        $(OBJS)\corelib_fontdlgg.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_listctrl.obj &
        $(OBJS)\corelib_mdig.obj &
        $(OBJS)\corelib_msgdlgg.obj &


@@ -1745,6 +1811,7 @@ ____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_stdrend.obj &

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


@@ -1753,8 +1820,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_winuniv.obj &
        $(OBJS)\corelib_gtk.obj &
        $(OBJS)\corelib_metal.obj &
        $(OBJS)\corelib_winuniv.obj &
        $(OBJS)\corelib_gtk.obj &
        $(OBJS)\corelib_metal.obj &

+       $(OBJS)\corelib_mono.obj &

        $(OBJS)\corelib_win32.obj &
        $(OBJS)\corelib_accesscmn.obj &
        $(OBJS)\corelib_win32.obj &
        $(OBJS)\corelib_accesscmn.obj &

+       $(OBJS)\corelib_anidecod.obj &

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


@@ -1773,6 +1842,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_ctrlsub.obj &
        $(OBJS)\corelib_datacmn.obj &
        $(OBJS)\corelib_dcbase.obj &
        $(OBJS)\corelib_ctrlsub.obj &
        $(OBJS)\corelib_datacmn.obj &
        $(OBJS)\corelib_dcbase.obj &

+       $(OBJS)\corelib_dcbufcmn.obj &

        $(OBJS)\corelib_dlgcmn.obj &
        $(OBJS)\corelib_dndcmn.obj &
        $(OBJS)\corelib_dobjcmn.obj &
        $(OBJS)\corelib_dlgcmn.obj &
        $(OBJS)\corelib_dndcmn.obj &
        $(OBJS)\corelib_dobjcmn.obj &


@@ -1795,6 +1865,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &
        $(OBJS)\corelib_gifdecod.obj &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &
        $(OBJS)\corelib_gifdecod.obj &

+       $(OBJS)\corelib_graphcmn.obj &

        $(OBJS)\corelib_helpbase.obj &
        $(OBJS)\corelib_iconbndl.obj &
        $(OBJS)\corelib_imagall.obj &
        $(OBJS)\corelib_helpbase.obj &
        $(OBJS)\corelib_iconbndl.obj &
        $(OBJS)\corelib_imagall.obj &


@@ -1811,6 +1882,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagxpm.obj &
        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &
        $(OBJS)\corelib_imagxpm.obj &
        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &

+       $(OBJS)\corelib_listctrlcmn.obj &

        $(OBJS)\corelib_matrix.obj &
        $(OBJS)\corelib_menucmn.obj &
        $(OBJS)\corelib_nbkbase.obj &
        $(OBJS)\corelib_matrix.obj &
        $(OBJS)\corelib_menucmn.obj &
        $(OBJS)\corelib_nbkbase.obj &


@@ -1879,7 +1951,10 @@ __advdll___depname = &
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &

+       $(OBJS)\advdll_animatecmn.obj &

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

+       $(OBJS)\advdll_aboutdlgg.obj &
+       $(OBJS)\advdll_bmpcboxg.obj &

        $(OBJS)\advdll_calctrl.obj &
        $(OBJS)\advdll_datavgen.obj &
        $(OBJS)\advdll_datectlg.obj &
        $(OBJS)\advdll_calctrl.obj &
        $(OBJS)\advdll_datavgen.obj &
        $(OBJS)\advdll_datectlg.obj &


@@ -1895,12 +1970,16 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_splash.obj &
        $(OBJS)\advdll_tipdlg.obj &
        $(OBJS)\advdll_wizard.obj &
        $(OBJS)\advdll_splash.obj &
        $(OBJS)\advdll_tipdlg.obj &
        $(OBJS)\advdll_wizard.obj &

+       $(OBJS)\advdll_animateg.obj &

        $(OBJS)\advdll_joystick.obj &
        $(OBJS)\advdll_sound.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_joystick.obj &
        $(OBJS)\advdll_sound.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &

+       $(OBJS)\advdll_animatecmn.obj &

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

+       $(OBJS)\advdll_aboutdlgg.obj &
+       $(OBJS)\advdll_bmpcboxg.obj &

        $(OBJS)\advdll_calctrl.obj &
        $(OBJS)\advdll_datavgen.obj &
        $(OBJS)\advdll_datectlg.obj &
        $(OBJS)\advdll_calctrl.obj &
        $(OBJS)\advdll_datavgen.obj &
        $(OBJS)\advdll_datectlg.obj &


@@ -1916,6 +1995,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_splash.obj &
        $(OBJS)\advdll_tipdlg.obj &
        $(OBJS)\advdll_wizard.obj &
        $(OBJS)\advdll_splash.obj &
        $(OBJS)\advdll_tipdlg.obj &
        $(OBJS)\advdll_wizard.obj &

+       $(OBJS)\advdll_animateg.obj &

        $(OBJS)\advdll_joystick.obj &
        $(OBJS)\advdll_sound.obj
 !endif
        $(OBJS)\advdll_joystick.obj &
        $(OBJS)\advdll_sound.obj
 !endif


@@ -1931,7 +2011,10 @@ __advlib___depname = &
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &

+       $(OBJS)\advlib_animatecmn.obj &

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

+       $(OBJS)\advlib_aboutdlgg.obj &
+       $(OBJS)\advlib_bmpcboxg.obj &

        $(OBJS)\advlib_calctrl.obj &
        $(OBJS)\advlib_datavgen.obj &
        $(OBJS)\advlib_datectlg.obj &
        $(OBJS)\advlib_calctrl.obj &
        $(OBJS)\advlib_datavgen.obj &
        $(OBJS)\advlib_datectlg.obj &


@@ -1947,12 +2030,16 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_splash.obj &
        $(OBJS)\advlib_tipdlg.obj &
        $(OBJS)\advlib_wizard.obj &
        $(OBJS)\advlib_splash.obj &
        $(OBJS)\advlib_tipdlg.obj &
        $(OBJS)\advlib_wizard.obj &

+       $(OBJS)\advlib_animateg.obj &

        $(OBJS)\advlib_joystick.obj &
        $(OBJS)\advlib_sound.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_joystick.obj &
        $(OBJS)\advlib_sound.obj
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &

+       $(OBJS)\advlib_animatecmn.obj &

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

+       $(OBJS)\advlib_aboutdlgg.obj &
+       $(OBJS)\advlib_bmpcboxg.obj &

        $(OBJS)\advlib_calctrl.obj &
        $(OBJS)\advlib_datavgen.obj &
        $(OBJS)\advlib_datectlg.obj &
        $(OBJS)\advlib_calctrl.obj &
        $(OBJS)\advlib_datavgen.obj &
        $(OBJS)\advlib_datectlg.obj &


@@ -1968,6 +2055,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_splash.obj &
        $(OBJS)\advlib_tipdlg.obj &
        $(OBJS)\advlib_wizard.obj &
        $(OBJS)\advlib_splash.obj &
        $(OBJS)\advlib_tipdlg.obj &
        $(OBJS)\advlib_wizard.obj &

+       $(OBJS)\advlib_animateg.obj &

        $(OBJS)\advlib_joystick.obj &
        $(OBJS)\advlib_sound.obj
 !endif
        $(OBJS)\advlib_joystick.obj &
        $(OBJS)\advlib_sound.obj
 !endif


@@ -2288,6 +2376,10 @@ __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif

+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif

 __SETUP_H_SUBDIR_FILENAMES =
 !ifeq WXUNIV 0
 __SETUP_H_SUBDIR_FILENAMES = os2
 __SETUP_H_SUBDIR_FILENAMES =
 !ifeq WXUNIV 0
 __SETUP_H_SUBDIR_FILENAMES = os2


@@ -2307,9 +2399,9 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" &
        USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" &
        USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &

-       USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &

        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 27
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 27


@@ -2320,7 +2412,7 @@ SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -i=..\..\include -i=$(SETUPHDIR) -d__WXPM__ &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -i=..\..\include -i=$(SETUPHDIR) -d__WXPM__ &

-       $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)

 WXREGEX_OBJECTS =  &
        $(OBJS)\wxregex_regcomp.obj &
        $(OBJS)\wxregex_regexec.obj &
 WXREGEX_OBJECTS =  &
        $(OBJS)\wxregex_regcomp.obj &
        $(OBJS)\wxregex_regexec.obj &


@@ -2458,18 +2550,19 @@ WXEXPAT_OBJECTS =  &
 MONODLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 MONODLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 &
-       -dWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)

 MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 &
-       -dWXMAKINGDLL /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL &
+       /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 MONODLL_OBJECTS =  &
        $(OBJS)\monodll_dummy.obj &
        $(OBJS)\monodll_appbase.obj &
 MONODLL_OBJECTS =  &
        $(OBJS)\monodll_dummy.obj &
        $(OBJS)\monodll_appbase.obj &


@@ -2507,6 +2600,7 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_module.obj &
        $(OBJS)\monodll_mstream.obj &
        $(OBJS)\monodll_object.obj &
        $(OBJS)\monodll_module.obj &
        $(OBJS)\monodll_mstream.obj &
        $(OBJS)\monodll_object.obj &

+       $(OBJS)\monodll_platinfo.obj &

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


@@ -2556,18 +2650,18 @@ MONODLL_OBJECTS =  &
 MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 &
-       $(CPPFLAGS) $(CFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)

 MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 &
-       /fh=$(OBJS)\wxprec_monolib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_monolib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_dummy.obj &
        $(OBJS)\monolib_appbase.obj &
 MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_dummy.obj &
        $(OBJS)\monolib_appbase.obj &


@@ -2605,6 +2699,7 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_module.obj &
        $(OBJS)\monolib_mstream.obj &
        $(OBJS)\monolib_object.obj &
        $(OBJS)\monolib_module.obj &
        $(OBJS)\monolib_mstream.obj &
        $(OBJS)\monolib_object.obj &

+       $(OBJS)\monolib_platinfo.obj &

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


@@ -2654,18 +2749,20 @@ MONOLIB_OBJECTS =  &
 BASEDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 BASEDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 &
+       $(CPPFLAGS) $(CFLAGS)

 BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_basedll.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 &
+       /fh=$(OBJS)\wxprec_basedll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_dummy.obj &
        $(OBJS)\basedll_appbase.obj &
 BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_dummy.obj &
        $(OBJS)\basedll_appbase.obj &


@@ -2703,6 +2800,7 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_module.obj &
        $(OBJS)\basedll_mstream.obj &
        $(OBJS)\basedll_object.obj &
        $(OBJS)\basedll_module.obj &
        $(OBJS)\basedll_mstream.obj &
        $(OBJS)\basedll_object.obj &

+       $(OBJS)\basedll_platinfo.obj &

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


@@ -2738,18 +2836,19 @@ BASEDLL_OBJECTS =  &
 BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)

 BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 &
+       /fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 BASELIB_OBJECTS =  &
        $(OBJS)\baselib_dummy.obj &
        $(OBJS)\baselib_appbase.obj &
 BASELIB_OBJECTS =  &
        $(OBJS)\baselib_dummy.obj &
        $(OBJS)\baselib_appbase.obj &


@@ -2787,6 +2886,7 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_module.obj &
        $(OBJS)\baselib_mstream.obj &
        $(OBJS)\baselib_object.obj &
        $(OBJS)\baselib_module.obj &
        $(OBJS)\baselib_mstream.obj &
        $(OBJS)\baselib_object.obj &

+       $(OBJS)\baselib_platinfo.obj &

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


@@ -2822,11 +2922,12 @@ BASELIB_OBJECTS =  &
 NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       -dWXUSINGDLL -dWXMAKINGDLL_NET /fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
+       /fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 NETDLL_OBJECTS =  &
        $(OBJS)\netdll_dummy.obj &
        $(OBJS)\netdll_fs_inet.obj &
 NETDLL_OBJECTS =  &
        $(OBJS)\netdll_dummy.obj &
        $(OBJS)\netdll_fs_inet.obj &


@@ -2843,11 +2944,11 @@ NETDLL_OBJECTS =  &
 NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       /fh=$(OBJS)\wxprec_netlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_netlib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 NETLIB_OBJECTS =  &
        $(OBJS)\netlib_dummy.obj &
        $(OBJS)\netlib_fs_inet.obj &
 NETLIB_OBJECTS =  &
        $(OBJS)\netlib_dummy.obj &
        $(OBJS)\netlib_fs_inet.obj &


@@ -2864,11 +2965,12 @@ NETLIB_OBJECTS =  &
 COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 /fh=$(OBJS)\wxprec_coredll.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 &
+       /fh=$(OBJS)\wxprec_coredll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 COREDLL_OBJECTS =  &
        $(OBJS)\coredll_dummy.obj &
        $(OBJS)\coredll_event.obj &
 COREDLL_OBJECTS =  &
        $(OBJS)\coredll_dummy.obj &
        $(OBJS)\coredll_event.obj &


@@ -2879,11 +2981,11 @@ COREDLL_OBJECTS =  &
 CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=0 &
-       /fh=$(OBJS)\wxprec_corelib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_BASE=0 /fh=$(OBJS)\wxprec_corelib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 CORELIB_OBJECTS =  &
        $(OBJS)\corelib_dummy.obj &
        $(OBJS)\corelib_event.obj &
 CORELIB_OBJECTS =  &
        $(OBJS)\corelib_dummy.obj &
        $(OBJS)\corelib_event.obj &


@@ -2894,55 +2996,58 @@ CORELIB_OBJECTS =  &
 ADVDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 ADVDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_ADV /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV &
+       /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 ADVDLL_OBJECTS =  &
        $(OBJS)\advdll_dummy.obj &
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
 ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 ADVDLL_OBJECTS =  &
        $(OBJS)\advdll_dummy.obj &
        $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
 ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 ADVLIB_OBJECTS =  &
        $(OBJS)\advlib_dummy.obj &
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 ADVLIB_OBJECTS =  &
        $(OBJS)\advlib_dummy.obj &
        $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
 MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_MEDIA /fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA &
+       /fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 MEDIADLL_OBJECTS =  &
        $(OBJS)\mediadll_dummy.obj &
        $(OBJS)\mediadll_mediactrlcmn.obj
 MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 MEDIADLL_OBJECTS =  &
        $(OBJS)\mediadll_dummy.obj &
        $(OBJS)\mediadll_mediactrlcmn.obj
 MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 MEDIALIB_OBJECTS =  &
        $(OBJS)\medialib_dummy.obj &
        $(OBJS)\medialib_mediactrlcmn.obj
 ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 MEDIALIB_OBJECTS =  &
        $(OBJS)\medialib_dummy.obj &
        $(OBJS)\medialib_mediactrlcmn.obj
 ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       -dWXUSINGDLL -dWXMAKINGDLL_ODBC /fh=$(OBJS)\wxprec_odbcdll.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC &
+       /fh=$(OBJS)\wxprec_odbcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 ODBCDLL_OBJECTS =  &
        $(OBJS)\odbcdll_dummy.obj &
        $(OBJS)\odbcdll_db.obj &
 ODBCDLL_OBJECTS =  &
        $(OBJS)\odbcdll_dummy.obj &
        $(OBJS)\odbcdll_db.obj &


@@ -2950,11 +3055,11 @@ ODBCDLL_OBJECTS =  &
 ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       /fh=$(OBJS)\wxprec_odbclib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_odbclib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 ODBCLIB_OBJECTS =  &
        $(OBJS)\odbclib_dummy.obj &
        $(OBJS)\odbclib_db.obj &
 ODBCLIB_OBJECTS =  &
        $(OBJS)\odbclib_dummy.obj &
        $(OBJS)\odbclib_db.obj &


@@ -2962,33 +3067,35 @@ ODBCLIB_OBJECTS =  &
 DBGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 DBGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_DBGRID /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID &
+       /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 DBGRIDDLL_OBJECTS =  &
        $(OBJS)\dbgriddll_dummy.obj &
        $(OBJS)\dbgriddll_dbgrid.obj
 DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 DBGRIDDLL_OBJECTS =  &
        $(OBJS)\dbgriddll_dummy.obj &
        $(OBJS)\dbgriddll_dbgrid.obj
 DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 DBGRIDLIB_OBJECTS =  &
        $(OBJS)\dbgridlib_dummy.obj &
        $(OBJS)\dbgridlib_dbgrid.obj
 HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 DBGRIDLIB_OBJECTS =  &
        $(OBJS)\dbgridlib_dummy.obj &
        $(OBJS)\dbgridlib_dbgrid.obj
 HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_HTML /fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML &
+       /fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 HTMLDLL_OBJECTS =  &
        $(OBJS)\htmldll_dummy.obj &
        $(OBJS)\htmldll_helpctrl.obj &
 HTMLDLL_OBJECTS =  &
        $(OBJS)\htmldll_dummy.obj &
        $(OBJS)\htmldll_helpctrl.obj &


@@ -3017,11 +3124,11 @@ HTMLDLL_OBJECTS =  &
 HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_dummy.obj &
        $(OBJS)\htmllib_helpctrl.obj &
 HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_dummy.obj &
        $(OBJS)\htmllib_helpctrl.obj &


@@ -3050,11 +3157,12 @@ HTMLLIB_OBJECTS =  &
 QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_QA /fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA &
+       /fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 QADLL_OBJECTS =  &
        $(OBJS)\qadll_dummy.obj &
        $(OBJS)\qadll_debugrpt.obj &
 QADLL_OBJECTS =  &
        $(OBJS)\qadll_dummy.obj &
        $(OBJS)\qadll_debugrpt.obj &


@@ -3062,11 +3170,11 @@ QADLL_OBJECTS =  &
 QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 QALIB_OBJECTS =  &
        $(OBJS)\qalib_dummy.obj &
        $(OBJS)\qalib_debugrpt.obj &
 QALIB_OBJECTS =  &
        $(OBJS)\qalib_dummy.obj &
        $(OBJS)\qalib_debugrpt.obj &


@@ -3074,11 +3182,12 @@ QALIB_OBJECTS =  &
 XMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 XMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       -dWXUSINGDLL -dWXMAKINGDLL_XML /fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML &
+       /fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 XMLDLL_OBJECTS =  &
        $(OBJS)\xmldll_dummy.obj &
        $(OBJS)\xmldll_xml.obj &
 XMLDLL_OBJECTS =  &
        $(OBJS)\xmldll_dummy.obj &
        $(OBJS)\xmldll_xml.obj &


@@ -3086,11 +3195,11 @@ XMLDLL_OBJECTS =  &
 XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 &
-       /fh=$(OBJS)\wxprec_xmllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_xmllib.pch &
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 XMLLIB_OBJECTS =  &
        $(OBJS)\xmllib_dummy.obj &
        $(OBJS)\xmllib_xml.obj &
 XMLLIB_OBJECTS =  &
        $(OBJS)\xmllib_dummy.obj &
        $(OBJS)\xmllib_xml.obj &


@@ -3098,15 +3207,18 @@ XMLLIB_OBJECTS =  &
 XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_XRC /fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC &
+       /fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_dummy.obj &
 XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_dummy.obj &

-       $(OBJS)\xrcdll_xh_bmpbt.obj &
+       $(OBJS)\xrcdll_xh_animatctrl.obj &

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

+       $(OBJS)\xrcdll_xh_bmpcbox.obj &
+       $(OBJS)\xrcdll_xh_bmpbt.obj &

        $(OBJS)\xrcdll_xh_bttn.obj &
        $(OBJS)\xrcdll_xh_cald.obj &
        $(OBJS)\xrcdll_xh_chckb.obj &
        $(OBJS)\xrcdll_xh_bttn.obj &
        $(OBJS)\xrcdll_xh_cald.obj &
        $(OBJS)\xrcdll_xh_chckb.obj &


@@ -3138,6 +3250,7 @@ XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_xh_radbx.obj &
        $(OBJS)\xrcdll_xh_scrol.obj &
        $(OBJS)\xrcdll_xh_scwin.obj &
        $(OBJS)\xrcdll_xh_radbx.obj &
        $(OBJS)\xrcdll_xh_scrol.obj &
        $(OBJS)\xrcdll_xh_scwin.obj &

+       $(OBJS)\xrcdll_xh_htmllbox.obj &

        $(OBJS)\xrcdll_xh_sizer.obj &
        $(OBJS)\xrcdll_xh_slidr.obj &
        $(OBJS)\xrcdll_xh_spin.obj &
        $(OBJS)\xrcdll_xh_sizer.obj &
        $(OBJS)\xrcdll_xh_slidr.obj &
        $(OBJS)\xrcdll_xh_spin.obj &


@@ -3159,15 +3272,17 @@ XRCDLL_OBJECTS =  &
 XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_dummy.obj &
 XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_dummy.obj &

-       $(OBJS)\xrclib_xh_bmpbt.obj &
+       $(OBJS)\xrclib_xh_animatctrl.obj &

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

+       $(OBJS)\xrclib_xh_bmpcbox.obj &
+       $(OBJS)\xrclib_xh_bmpbt.obj &

        $(OBJS)\xrclib_xh_bttn.obj &
        $(OBJS)\xrclib_xh_cald.obj &
        $(OBJS)\xrclib_xh_chckb.obj &
        $(OBJS)\xrclib_xh_bttn.obj &
        $(OBJS)\xrclib_xh_cald.obj &
        $(OBJS)\xrclib_xh_chckb.obj &


@@ -3199,6 +3314,7 @@ XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_xh_radbx.obj &
        $(OBJS)\xrclib_xh_scrol.obj &
        $(OBJS)\xrclib_xh_scwin.obj &
        $(OBJS)\xrclib_xh_radbx.obj &
        $(OBJS)\xrclib_xh_scrol.obj &
        $(OBJS)\xrclib_xh_scwin.obj &

+       $(OBJS)\xrclib_xh_htmllbox.obj &

        $(OBJS)\xrclib_xh_sizer.obj &
        $(OBJS)\xrclib_xh_slidr.obj &
        $(OBJS)\xrclib_xh_spin.obj &
        $(OBJS)\xrclib_xh_sizer.obj &
        $(OBJS)\xrclib_xh_slidr.obj &
        $(OBJS)\xrclib_xh_spin.obj &


@@ -3220,78 +3336,91 @@ XRCLIB_OBJECTS =  &
 AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_AUI /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI &
+       /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 AUIDLL_OBJECTS =  &
        $(OBJS)\auidll_dummy.obj &
        $(OBJS)\auidll_framemanager.obj &
        $(OBJS)\auidll_dockart.obj &
 AUIDLL_OBJECTS =  &
        $(OBJS)\auidll_dummy.obj &
        $(OBJS)\auidll_framemanager.obj &
        $(OBJS)\auidll_dockart.obj &

-       $(OBJS)\auidll_floatpane.obj
+       $(OBJS)\auidll_floatpane.obj &
+       $(OBJS)\auidll_auibook.obj &
+       $(OBJS)\auidll_tabmdi.obj

 AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 AUILIB_OBJECTS =  &
        $(OBJS)\auilib_dummy.obj &
        $(OBJS)\auilib_framemanager.obj &
        $(OBJS)\auilib_dockart.obj &
 AUILIB_OBJECTS =  &
        $(OBJS)\auilib_dummy.obj &
        $(OBJS)\auilib_framemanager.obj &
        $(OBJS)\auilib_dockart.obj &

-       $(OBJS)\auilib_floatpane.obj
+       $(OBJS)\auilib_floatpane.obj &
+       $(OBJS)\auilib_auibook.obj &
+       $(OBJS)\auilib_tabmdi.obj

 RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_RICHTEXT /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT &
+       /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
+       $(CPPFLAGS) $(CXXFLAGS)

 RICHTEXTDLL_OBJECTS =  &
        $(OBJS)\richtextdll_dummy.obj &
        $(OBJS)\richtextdll_richtextctrl.obj &
        $(OBJS)\richtextdll_richtextbuffer.obj &
        $(OBJS)\richtextdll_richtextstyles.obj &
        $(OBJS)\richtextdll_richtextxml.obj &
 RICHTEXTDLL_OBJECTS =  &
        $(OBJS)\richtextdll_dummy.obj &
        $(OBJS)\richtextdll_richtextctrl.obj &
        $(OBJS)\richtextdll_richtextbuffer.obj &
        $(OBJS)\richtextdll_richtextstyles.obj &
        $(OBJS)\richtextdll_richtextxml.obj &

-       $(OBJS)\richtextdll_richtexthtml.obj
+       $(OBJS)\richtextdll_richtexthtml.obj &
+       $(OBJS)\richtextdll_richtextformatdlg.obj &
+       $(OBJS)\richtextdll_richtextsymboldlg.obj &
+       $(OBJS)\richtextdll_richtextstyledlg.obj

 RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 RICHTEXTLIB_OBJECTS =  &
        $(OBJS)\richtextlib_dummy.obj &
        $(OBJS)\richtextlib_richtextctrl.obj &
        $(OBJS)\richtextlib_richtextbuffer.obj &
        $(OBJS)\richtextlib_richtextstyles.obj &
        $(OBJS)\richtextlib_richtextxml.obj &
 RICHTEXTLIB_OBJECTS =  &
        $(OBJS)\richtextlib_dummy.obj &
        $(OBJS)\richtextlib_richtextctrl.obj &
        $(OBJS)\richtextlib_richtextbuffer.obj &
        $(OBJS)\richtextlib_richtextstyles.obj &
        $(OBJS)\richtextlib_richtextxml.obj &

-       $(OBJS)\richtextlib_richtexthtml.obj
+       $(OBJS)\richtextlib_richtexthtml.obj &
+       $(OBJS)\richtextlib_richtextformatdlg.obj &
+       $(OBJS)\richtextlib_richtextsymboldlg.obj &
+       $(OBJS)\richtextlib_richtextstyledlg.obj

 GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL &
-       -dWXMAKINGDLL_GL /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL &
+       /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 GLDLL_OBJECTS =  &
        $(OBJS)\gldll_dummy.obj &
        $(OBJS)\gldll_glcanvas.obj
 GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 GLDLL_OBJECTS =  &
        $(OBJS)\gldll_dummy.obj &
        $(OBJS)\gldll_glcanvas.obj
 GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png &
-       -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib &
-       /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
+       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\tiff -i=..\..\src\jpeg &
+       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 GLLIB_OBJECTS =  &
        $(OBJS)\gllib_dummy.obj &
        $(OBJS)\gllib_glcanvas.obj
 GLLIB_OBJECTS =  &
        $(OBJS)\gllib_dummy.obj &
        $(OBJS)\gllib_glcanvas.obj


@@ -3516,14 +3645,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_GUI 1
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_GUI 1

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll :  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll :  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(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 caseexact
        @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
        @%create $(OBJS)\advdll.lbc
        @%append $(OBJS)\advdll.lbc option quiet
        @%append $(OBJS)\advdll.lbc name $^@
        @%append $(OBJS)\advdll.lbc option caseexact
        @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i

        @%append $(OBJS)\advdll.lbc
        @%append $(OBJS)\advdll.lbc system os2v2 dll
        wlink @$(OBJS)\advdll.lbc
        @%append $(OBJS)\advdll.lbc
        @%append $(OBJS)\advdll.lbc system os2v2 dll
        wlink @$(OBJS)\advdll.lbc


@@ -3878,7 +4007,7 @@ $(SETUPHDIR)\wx\setup.h :
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
        @echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE)
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
        @echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE)

-       @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)

        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)


@@ -3899,6 +4028,7 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)

+       @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)

        @echo COMPILER=wat >>$(BUILD_CFG_FILE)
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)
        @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
        @echo COMPILER=wat >>$(BUILD_CFG_FILE)
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)
        @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)


@@ -4366,6 +4496,9 @@ $(OBJS)\monodll_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
 $(OBJS)\monodll_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_platinfo.obj :  .AUTODEPEND ..\..\src\common\platinfo.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4498,6 +4631,9 @@ $(OBJS)\monodll_gsocket.obj :  .AUTODEPEND ..\..\src\unix\gsocket.cpp
 $(OBJS)\monodll_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_app.obj :  .AUTODEPEND ..\..\src\os2\app.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_app.obj :  .AUTODEPEND ..\..\src\os2\app.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4564,9 +4700,6 @@ $(OBJS)\monodll_frame.obj :  .AUTODEPEND ..\..\src\os2\frame.cpp
 $(OBJS)\monodll_gdiimage.obj :  .AUTODEPEND ..\..\src\os2\gdiimage.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_gdiimage.obj :  .AUTODEPEND ..\..\src\os2\gdiimage.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

-$(OBJS)\monodll_gdiobj.obj :  .AUTODEPEND ..\..\src\os2\gdiobj.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-

 $(OBJS)\monodll_gsockpm.obj :  .AUTODEPEND ..\..\src\os2\gsockpm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_gsockpm.obj :  .AUTODEPEND ..\..\src\os2\gsockpm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4669,6 +4802,9 @@ $(OBJS)\monodll_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
 $(OBJS)\monodll_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4684,6 +4820,9 @@ $(OBJS)\monodll_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
 $(OBJS)\monodll_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4774,12 +4913,18 @@ $(OBJS)\monodll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monodll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

-$(OBJS)\monodll_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\monodll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_xh_bmpcbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4873,6 +5018,9 @@ $(OBJS)\monodll_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\monodll_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4936,6 +5084,12 @@ $(OBJS)\monodll_dockart.obj :  .AUTODEPEND ..\..\src\aui\dockart.cpp
 $(OBJS)\monodll_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4951,6 +5105,15 @@ $(OBJS)\monodll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cp
 $(OBJS)\monodll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 

+$(OBJS)\monodll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+

 $(OBJS)\monodll_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 


@@ -4958,22 +5121,22 @@ $(OBJS)\monodll_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 !ifeq USE_GUI 1

-$(OBJS)\monodll_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
+$(OBJS)\monodll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\monodll_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
+$(OBJS)\monodll_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\monodll_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
+$(OBJS)\monodll_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\monodll_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
+$(OBJS)\monodll_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp

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


@@ -5361,6 +5524,11 @@ $(OBJS)\monodll_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -5451,6 +5619,11 @@ $(OBJS)\monodll_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -5561,6 +5734,11 @@ $(OBJS)\monodll_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -5641,6 +5819,11 @@ $(OBJS)\monodll_lboxcmn.obj :  .AUTODEPEND ..\..\src\common\lboxcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -5911,11 +6094,26 @@ $(OBJS)\monodll_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -5991,6 +6189,11 @@ $(OBJS)\monodll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_joystick.obj :  .AUTODEPEND ..\..\src\os2\joystick.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_joystick.obj :  .AUTODEPEND ..\..\src\os2\joystick.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -6109,6 +6312,9 @@ $(OBJS)\monolib_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
 $(OBJS)\monolib_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_platinfo.obj :  .AUTODEPEND ..\..\src\common\platinfo.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6241,6 +6447,9 @@ $(OBJS)\monolib_gsocket.obj :  .AUTODEPEND ..\..\src\unix\gsocket.cpp
 $(OBJS)\monolib_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_app.obj :  .AUTODEPEND ..\..\src\os2\app.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_app.obj :  .AUTODEPEND ..\..\src\os2\app.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6307,9 +6516,6 @@ $(OBJS)\monolib_frame.obj :  .AUTODEPEND ..\..\src\os2\frame.cpp
 $(OBJS)\monolib_gdiimage.obj :  .AUTODEPEND ..\..\src\os2\gdiimage.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_gdiimage.obj :  .AUTODEPEND ..\..\src\os2\gdiimage.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

-$(OBJS)\monolib_gdiobj.obj :  .AUTODEPEND ..\..\src\os2\gdiobj.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-

 $(OBJS)\monolib_gsockpm.obj :  .AUTODEPEND ..\..\src\os2\gsockpm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_gsockpm.obj :  .AUTODEPEND ..\..\src\os2\gsockpm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6412,6 +6618,9 @@ $(OBJS)\monolib_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
 $(OBJS)\monolib_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6427,6 +6636,9 @@ $(OBJS)\monolib_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
 $(OBJS)\monolib_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6517,12 +6729,18 @@ $(OBJS)\monolib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
 $(OBJS)\monolib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

-$(OBJS)\monolib_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\monolib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_xh_bmpcbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6616,6 +6834,9 @@ $(OBJS)\monolib_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\monolib_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6679,6 +6900,12 @@ $(OBJS)\monolib_dockart.obj :  .AUTODEPEND ..\..\src\aui\dockart.cpp
 $(OBJS)\monolib_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6694,6 +6921,15 @@ $(OBJS)\monolib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cp
 $(OBJS)\monolib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 

+$(OBJS)\monolib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+

 $(OBJS)\monolib_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 


@@ -6701,22 +6937,22 @@ $(OBJS)\monolib_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 !ifeq USE_GUI 1

-$(OBJS)\monolib_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
+$(OBJS)\monolib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\monolib_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
+$(OBJS)\monolib_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\monolib_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
+$(OBJS)\monolib_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\monolib_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
+$(OBJS)\monolib_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp

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


@@ -7104,6 +7340,11 @@ $(OBJS)\monolib_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -7194,6 +7435,11 @@ $(OBJS)\monolib_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -7304,6 +7550,11 @@ $(OBJS)\monolib_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -7384,6 +7635,11 @@ $(OBJS)\monolib_lboxcmn.obj :  .AUTODEPEND ..\..\src\common\lboxcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -7654,11 +7910,26 @@ $(OBJS)\monolib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -7734,6 +8005,11 @@ $(OBJS)\monolib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_joystick.obj :  .AUTODEPEND ..\..\src\os2\joystick.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_joystick.obj :  .AUTODEPEND ..\..\src\os2\joystick.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -7852,6 +8128,9 @@ $(OBJS)\basedll_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
 $(OBJS)\basedll_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 

+$(OBJS)\basedll_platinfo.obj :  .AUTODEPEND ..\..\src\common\platinfo.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+

 $(OBJS)\basedll_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 


@@ -8056,6 +8335,9 @@ $(OBJS)\baselib_mstream.obj :  .AUTODEPEND ..\..\src\common\mstream.cpp
 $(OBJS)\baselib_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_object.obj :  .AUTODEPEND ..\..\src\common\object.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 

+$(OBJS)\baselib_platinfo.obj :  .AUTODEPEND ..\..\src\common\platinfo.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+

 $(OBJS)\baselib_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
 $(OBJS)\baselib_powercmn.obj :  .AUTODEPEND ..\..\src\common\powercmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 


@@ -8242,6 +8524,9 @@ $(OBJS)\coredll_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
 $(OBJS)\coredll_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(OBJS)\coredll_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 

+$(OBJS)\coredll_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+

 $(OBJS)\coredll_app.obj :  .AUTODEPEND ..\..\src\os2\app.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(OBJS)\coredll_app.obj :  .AUTODEPEND ..\..\src\os2\app.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 


@@ -8308,9 +8593,6 @@ $(OBJS)\coredll_frame.obj :  .AUTODEPEND ..\..\src\os2\frame.cpp
 $(OBJS)\coredll_gdiimage.obj :  .AUTODEPEND ..\..\src\os2\gdiimage.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(OBJS)\coredll_gdiimage.obj :  .AUTODEPEND ..\..\src\os2\gdiimage.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 

-$(OBJS)\coredll_gdiobj.obj :  .AUTODEPEND ..\..\src\os2\gdiobj.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-

 $(OBJS)\coredll_gsockpm.obj :  .AUTODEPEND ..\..\src\os2\gsockpm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(OBJS)\coredll_gsockpm.obj :  .AUTODEPEND ..\..\src\os2\gsockpm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 


@@ -8413,6 +8695,9 @@ $(OBJS)\coredll_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
 $(OBJS)\coredll_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(OBJS)\coredll_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 

+$(OBJS)\coredll_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+

 $(OBJS)\coredll_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(OBJS)\coredll_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 


@@ -8428,26 +8713,29 @@ $(OBJS)\coredll_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
 $(OBJS)\coredll_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(OBJS)\coredll_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 

+$(OBJS)\coredll_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+

 $(OBJS)\coredll_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 !ifeq USE_GUI 1
 $(OBJS)\coredll_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 !ifeq USE_GUI 1

-$(OBJS)\coredll_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
+$(OBJS)\coredll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\coredll_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
+$(OBJS)\coredll_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\coredll_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
+$(OBJS)\coredll_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\coredll_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
+$(OBJS)\coredll_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 


@@ -8835,6 +9123,11 @@ $(OBJS)\coredll_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\coredll_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\coredll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -8925,6 +9218,11 @@ $(OBJS)\coredll_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\coredll_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\coredll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -9035,6 +9333,11 @@ $(OBJS)\coredll_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\coredll_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\coredll_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -9115,6 +9418,11 @@ $(OBJS)\coredll_lboxcmn.obj :  .AUTODEPEND ..\..\src\common\lboxcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\coredll_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\coredll_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -9403,6 +9711,9 @@ $(OBJS)\corelib_utilscmn.obj :  .AUTODEPEND ..\..\src\common\utilscmn.cpp
 $(OBJS)\corelib_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(OBJS)\corelib_caret.obj :  .AUTODEPEND ..\..\src\generic\caret.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 

+$(OBJS)\corelib_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+

 $(OBJS)\corelib_app.obj :  .AUTODEPEND ..\..\src\os2\app.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(OBJS)\corelib_app.obj :  .AUTODEPEND ..\..\src\os2\app.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 


@@ -9469,9 +9780,6 @@ $(OBJS)\corelib_frame.obj :  .AUTODEPEND ..\..\src\os2\frame.cpp
 $(OBJS)\corelib_gdiimage.obj :  .AUTODEPEND ..\..\src\os2\gdiimage.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(OBJS)\corelib_gdiimage.obj :  .AUTODEPEND ..\..\src\os2\gdiimage.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 

-$(OBJS)\corelib_gdiobj.obj :  .AUTODEPEND ..\..\src\os2\gdiobj.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-

 $(OBJS)\corelib_gsockpm.obj :  .AUTODEPEND ..\..\src\os2\gsockpm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(OBJS)\corelib_gsockpm.obj :  .AUTODEPEND ..\..\src\os2\gsockpm.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 


@@ -9574,6 +9882,9 @@ $(OBJS)\corelib_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
 $(OBJS)\corelib_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(OBJS)\corelib_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 

+$(OBJS)\corelib_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+

 $(OBJS)\corelib_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(OBJS)\corelib_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 


@@ -9589,26 +9900,29 @@ $(OBJS)\corelib_gtk.obj :  .AUTODEPEND ..\..\src\univ\themes\gtk.cpp
 $(OBJS)\corelib_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 $(OBJS)\corelib_metal.obj :  .AUTODEPEND ..\..\src\univ\themes\metal.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 

+$(OBJS)\corelib_mono.obj :  .AUTODEPEND ..\..\src\univ\themes\mono.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+

 $(OBJS)\corelib_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 !ifeq USE_GUI 1
 $(OBJS)\corelib_win32.obj :  .AUTODEPEND ..\..\src\univ\themes\win32.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
 !ifeq USE_GUI 1

-$(OBJS)\corelib_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
+$(OBJS)\corelib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\corelib_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
+$(OBJS)\corelib_colrdlgg.obj :  .AUTODEPEND ..\..\src\generic\colrdlgg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\corelib_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp
+$(OBJS)\corelib_dirdlgg.obj :  .AUTODEPEND ..\..\src\generic\dirdlgg.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
 !ifeq USE_GUI 1

-$(OBJS)\corelib_imaglist.obj :  .AUTODEPEND ..\..\src\generic\imaglist.cpp
+$(OBJS)\corelib_fdrepdlg.obj :  .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp

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


@@ -9996,6 +10310,11 @@ $(OBJS)\corelib_accesscmn.obj :  .AUTODEPEND ..\..\src\common\accesscmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\corelib_anidecod.obj :  .AUTODEPEND ..\..\src\common\anidecod.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\corelib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_appcmn.obj :  .AUTODEPEND ..\..\src\common\appcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -10086,6 +10405,11 @@ $(OBJS)\corelib_dcbase.obj :  .AUTODEPEND ..\..\src\common\dcbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\corelib_dcbufcmn.obj :  .AUTODEPEND ..\..\src\common\dcbufcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\corelib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -10196,6 +10520,11 @@ $(OBJS)\corelib_gifdecod.obj :  .AUTODEPEND ..\..\src\common\gifdecod.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\corelib_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\corelib_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_helpbase.obj :  .AUTODEPEND ..\..\src\common\helpbase.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -10276,6 +10605,11 @@ $(OBJS)\corelib_lboxcmn.obj :  .AUTODEPEND ..\..\src\common\lboxcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\corelib_listctrlcmn.obj :  .AUTODEPEND ..\..\src\common\listctrlcmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\corelib_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_matrix.obj :  .AUTODEPEND ..\..\src\common\matrix.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -10549,9 +10883,18 @@ $(OBJS)\corelib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
 $(OBJS)\advdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 

+$(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+

 $(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 

+$(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+

 $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 


@@ -10597,6 +10940,9 @@ $(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
 $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 

+$(OBJS)\advdll_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+

 $(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\..\src\os2\joystick.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\..\src\os2\joystick.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 


@@ -10606,9 +10952,18 @@ $(OBJS)\advdll_sound.obj :  .AUTODEPEND ..\..\src\os2\sound.cpp
 $(OBJS)\advlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 

+$(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+

 $(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 

+$(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+

 $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 


@@ -10654,6 +11009,9 @@ $(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
 $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 

+$(OBJS)\advlib_animateg.obj :  .AUTODEPEND ..\..\src\generic\animateg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+

 $(OBJS)\advlib_joystick.obj :  .AUTODEPEND ..\..\src\os2\joystick.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_joystick.obj :  .AUTODEPEND ..\..\src\os2\joystick.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 


@@ -10885,12 +11243,18 @@ $(OBJS)\xmllib_xtixml.obj :  .AUTODEPEND ..\..\src\common\xtixml.cpp
 $(OBJS)\xrcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\xrcdll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 

+$(OBJS)\xrcdll_xh_bmpcbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+

 $(OBJS)\xrcdll_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 


@@ -10984,6 +11348,9 @@ $(OBJS)\xrcdll_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\xrcdll_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 

+$(OBJS)\xrcdll_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+

 $(OBJS)\xrcdll_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 


@@ -11041,12 +11408,18 @@ $(OBJS)\xrcdll_xmlrsall.obj :  .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
 $(OBJS)\xrclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
 $(OBJS)\xrclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
+$(OBJS)\xrclib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp

        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
 $(OBJS)\xrclib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
 $(OBJS)\xrclib_xh_bmp.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 

+$(OBJS)\xrclib_xh_bmpcbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_bmpbt.obj :  .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+

 $(OBJS)\xrclib_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
 $(OBJS)\xrclib_xh_bttn.obj :  .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 


@@ -11140,6 +11513,9 @@ $(OBJS)\xrclib_xh_scrol.obj :  .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp
 $(OBJS)\xrclib_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
 $(OBJS)\xrclib_xh_scwin.obj :  .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 

+$(OBJS)\xrclib_xh_htmllbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+

 $(OBJS)\xrclib_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
 $(OBJS)\xrclib_xh_sizer.obj :  .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 


@@ -11206,6 +11582,12 @@ $(OBJS)\auidll_dockart.obj :  .AUTODEPEND ..\..\src\aui\dockart.cpp
 $(OBJS)\auidll_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
 
 $(OBJS)\auidll_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
 

+$(OBJS)\auidll_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
+
+$(OBJS)\auidll_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
+

 $(OBJS)\auilib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
 
 $(OBJS)\auilib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
 


@@ -11218,6 +11600,12 @@ $(OBJS)\auilib_dockart.obj :  .AUTODEPEND ..\..\src\aui\dockart.cpp
 $(OBJS)\auilib_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
 
 $(OBJS)\auilib_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
 

+$(OBJS)\auilib_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
+
+$(OBJS)\auilib_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
+

 $(OBJS)\richtextdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
 
 $(OBJS)\richtextdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
 


@@ -11236,6 +11624,15 @@ $(OBJS)\richtextdll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxm
 $(OBJS)\richtextdll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
 
 $(OBJS)\richtextdll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
 

+$(OBJS)\richtextdll_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
+
+$(OBJS)\richtextdll_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
+
+$(OBJS)\richtextdll_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
+

 $(OBJS)\richtextlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
 
 $(OBJS)\richtextlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
 


@@ -11254,6 +11651,15 @@ $(OBJS)\richtextlib_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxm
 $(OBJS)\richtextlib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
 
 $(OBJS)\richtextlib_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
 

+$(OBJS)\richtextlib_richtextformatdlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
+
+$(OBJS)\richtextlib_richtextsymboldlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
+
+$(OBJS)\richtextlib_richtextstyledlg.obj :  .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp
+       $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<
+

 $(OBJS)\gldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
 
 $(OBJS)\gldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<