Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 33da3d6ae104844ef374b43edb3f345cbe9741d5..ceb6f40843fbd3dfff531b0aed864105e421642c 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -14,7 +14,8 @@
 \r
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
        CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
+       TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \\r
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
        TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
        DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
@@ -167,8 +168,11 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_fax3sm.obj \\r
        $(OBJS)\wxtiff_tif_flush.obj \\r
        $(OBJS)\wxtiff_tif_getimage.obj \\r
+       $(OBJS)\wxtiff_tif_jbig.obj \\r
        $(OBJS)\wxtiff_tif_jpeg.obj \\r
+       $(OBJS)\wxtiff_tif_jpeg_12.obj \\r
        $(OBJS)\wxtiff_tif_luv.obj \\r
+       $(OBJS)\wxtiff_tif_lzma.obj \\r
        $(OBJS)\wxtiff_tif_lzw.obj \\r
        $(OBJS)\wxtiff_tif_next.obj \\r
        $(OBJS)\wxtiff_tif_ojpeg.obj \\r
@@ -1203,7 +1207,8 @@ WEBVIEWDLL_OBJECTS =  \
        $(OBJS)\webviewdll_dummy.obj \\r
        $(OBJS)\webviewdll_webview_ie.obj \\r
        $(OBJS)\webviewdll_webview.obj \\r
-       $(OBJS)\webviewdll_webviewarchivehandler.obj\r
+       $(OBJS)\webviewdll_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewdll_webviewfshandler.obj\r
 WEBVIEWDLL_RESOURCES =  \\r
        $(OBJS)\webviewdll_version.res\r
 WEBVIEWLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \\r
@@ -1223,7 +1228,8 @@ WEBVIEWLIB_OBJECTS =  \
        $(OBJS)\webviewlib_dummy.obj \\r
        $(OBJS)\webviewlib_webview_ie.obj \\r
        $(OBJS)\webviewlib_webview.obj \\r
-       $(OBJS)\webviewlib_webviewarchivehandler.obj\r
+       $(OBJS)\webviewlib_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewlib_webviewfshandler.obj\r
 QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb \\r
@@ -1479,7 +1485,8 @@ AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_auibook.obj \\r
        $(OBJS)\auidll_auibar.obj \\r
        $(OBJS)\auidll_tabmdi.obj \\r
-       $(OBJS)\auidll_tabart.obj\r
+       $(OBJS)\auidll_tabart.obj \\r
+       $(OBJS)\auidll_xh_auinotbk.obj\r
 AUIDLL_RESOURCES =  \\r
        $(OBJS)\auidll_version.res\r
 AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \\r
@@ -1503,7 +1510,8 @@ AUILIB_OBJECTS =  \
        $(OBJS)\auilib_auibook.obj \\r
        $(OBJS)\auilib_auibar.obj \\r
        $(OBJS)\auilib_tabmdi.obj \\r
-       $(OBJS)\auilib_tabart.obj\r
+       $(OBJS)\auilib_tabart.obj \\r
+       $(OBJS)\auilib_xh_auinotbk.obj\r
 RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb \\r
@@ -1528,7 +1536,8 @@ RIBBONDLL_OBJECTS =  \
        $(OBJS)\ribbondll_gallery.obj \\r
        $(OBJS)\ribbondll_page.obj \\r
        $(OBJS)\ribbondll_panel.obj \\r
-       $(OBJS)\ribbondll_toolbar.obj\r
+       $(OBJS)\ribbondll_toolbar.obj \\r
+       $(OBJS)\ribbondll_xh_ribbon.obj\r
 RIBBONDLL_RESOURCES =  \\r
        $(OBJS)\ribbondll_version.res\r
 RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \\r
@@ -1555,7 +1564,8 @@ RIBBONLIB_OBJECTS =  \
        $(OBJS)\ribbonlib_gallery.obj \\r
        $(OBJS)\ribbonlib_page.obj \\r
        $(OBJS)\ribbonlib_panel.obj \\r
-       $(OBJS)\ribbonlib_toolbar.obj\r
+       $(OBJS)\ribbonlib_toolbar.obj \\r
+       $(OBJS)\ribbonlib_xh_ribbon.obj\r
 PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb \\r
@@ -1628,7 +1638,8 @@ RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_richtextstyledlg.obj \\r
        $(OBJS)\richtextdll_richtextstyles.obj \\r
        $(OBJS)\richtextdll_richtextsymboldlg.obj \\r
-       $(OBJS)\richtextdll_richtextxml.obj\r
+       $(OBJS)\richtextdll_richtextxml.obj \\r
+       $(OBJS)\richtextdll_xh_richtext.obj\r
 RICHTEXTDLL_RESOURCES =  \\r
        $(OBJS)\richtextdll_version.res\r
 RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \\r
@@ -1655,7 +1666,8 @@ RICHTEXTLIB_OBJECTS =  \
        $(OBJS)\richtextlib_richtextstyledlg.obj \\r
        $(OBJS)\richtextlib_richtextstyles.obj \\r
        $(OBJS)\richtextlib_richtextsymboldlg.obj \\r
-       $(OBJS)\richtextlib_richtextxml.obj\r
+       $(OBJS)\richtextlib_richtextxml.obj \\r
+       $(OBJS)\richtextlib_xh_richtext.obj\r
 STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb \\r
@@ -1760,7 +1772,7 @@ ARCH_SUFFIX = _x64
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
 !endif\r
 !if "$(OFFICIAL_BUILD)" == "1"\r
 COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
@@ -1935,6 +1947,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_webview_ie.obj \\r
        $(OBJS)\monodll_webview.obj \\r
        $(OBJS)\monodll_webviewarchivehandler.obj \\r
+       $(OBJS)\monodll_webviewfshandler.obj \\r
        $(OBJS)\monodll_debugrpt.obj \\r
        $(OBJS)\monodll_dbgrptg.obj \\r
        $(OBJS)\monodll_xh_animatctrl.obj \\r
@@ -2009,6 +2022,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_auibar.obj \\r
        $(OBJS)\monodll_tabmdi.obj \\r
        $(OBJS)\monodll_tabart.obj \\r
+       $(OBJS)\monodll_xh_auinotbk.obj \\r
        $(OBJS)\monodll_advprops.obj \\r
        $(OBJS)\monodll_editors.obj \\r
        $(OBJS)\monodll_manager.obj \\r
@@ -2027,6 +2041,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_page.obj \\r
        $(OBJS)\monodll_ribbon_panel.obj \\r
        $(OBJS)\monodll_ribbon_toolbar.obj \\r
+       $(OBJS)\monodll_xh_ribbon.obj \\r
        $(OBJS)\monodll_richtextbuffer.obj \\r
        $(OBJS)\monodll_richtextctrl.obj \\r
        $(OBJS)\monodll_richtextformatdlg.obj \\r
@@ -2037,6 +2052,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_richtextstyles.obj \\r
        $(OBJS)\monodll_richtextsymboldlg.obj \\r
        $(OBJS)\monodll_richtextxml.obj \\r
+       $(OBJS)\monodll_xh_richtext.obj \\r
        $(OBJS)\monodll_stc.obj \\r
        $(OBJS)\monodll_PlatWX.obj \\r
        $(OBJS)\monodll_ScintillaWX.obj\r
@@ -2076,6 +2092,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dropsrc.obj \\r
        $(OBJS)\monodll_droptgt.obj \\r
        $(OBJS)\monodll_oleutils.obj \\r
+       $(OBJS)\monodll_safearray.obj \\r
        $(OBJS)\monodll_palette.obj \\r
        $(OBJS)\monodll_pen.obj \\r
        $(OBJS)\monodll_popupwin.obj \\r
@@ -2084,6 +2101,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_region.obj \\r
        $(OBJS)\monodll_renderer.obj \\r
        $(OBJS)\monodll_settings.obj \\r
+       $(OBJS)\monodll_textmeasure.obj \\r
        $(OBJS)\monodll_tooltip.obj \\r
        $(OBJS)\monodll_toplevel.obj \\r
        $(OBJS)\monodll_uiaction.obj \\r
@@ -2237,6 +2255,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_markupparser.obj \\r
        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r
+       $(OBJS)\monodll_modalhook.obj \\r
        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
@@ -2246,6 +2265,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
+       $(OBJS)\monodll_preferencescmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
        $(OBJS)\monodll_radiobtncmn.obj \\r
@@ -2269,6 +2289,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_tbarbase.obj \\r
        $(OBJS)\monodll_textcmn.obj \\r
        $(OBJS)\monodll_textentrycmn.obj \\r
+       $(OBJS)\monodll_textmeasurecmn.obj \\r
        $(OBJS)\monodll_toplvcmn.obj \\r
        $(OBJS)\monodll_treebase.obj \\r
        $(OBJS)\monodll_uiactioncmn.obj \\r
@@ -2297,6 +2318,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msgdlgg.obj \\r
        $(OBJS)\monodll_numdlgg.obj \\r
        $(OBJS)\monodll_progdlgg.obj \\r
+       $(OBJS)\monodll_preferencesg.obj \\r
        $(OBJS)\monodll_printps.obj \\r
        $(OBJS)\monodll_renderg.obj \\r
        $(OBJS)\monodll_richmsgdlgg.obj \\r
@@ -2313,7 +2335,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_treectlg.obj \\r
        $(OBJS)\monodll_treebkg.obj \\r
        $(OBJS)\monodll_vlbox.obj \\r
-       $(OBJS)\monodll_vscroll.obj\r
+       $(OBJS)\monodll_vscroll.obj \\r
+       $(OBJS)\monodll_xmlreshandler.obj\r
 !endif\r
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
 ____CORE_SRC_FILENAMES_OBJECTS =  \\r
@@ -2350,6 +2373,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dropsrc.obj \\r
        $(OBJS)\monodll_droptgt.obj \\r
        $(OBJS)\monodll_oleutils.obj \\r
+       $(OBJS)\monodll_safearray.obj \\r
        $(OBJS)\monodll_palette.obj \\r
        $(OBJS)\monodll_pen.obj \\r
        $(OBJS)\monodll_popupwin.obj \\r
@@ -2358,6 +2382,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_region.obj \\r
        $(OBJS)\monodll_renderer.obj \\r
        $(OBJS)\monodll_settings.obj \\r
+       $(OBJS)\monodll_textmeasure.obj \\r
        $(OBJS)\monodll_tooltip.obj \\r
        $(OBJS)\monodll_toplevel.obj \\r
        $(OBJS)\monodll_uiaction.obj \\r
@@ -2369,7 +2394,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.obj \\r
        $(OBJS)\monodll_automtn.obj \\r
        $(OBJS)\monodll_uuid.obj \\r
-       $(OBJS)\monodll_evtloop.obj \
+       $(OBJS)\monodll_evtloop.obj \\r
        $(OBJS)\monodll_generic_accel.obj \\r
        $(OBJS)\monodll_clrpickerg.obj \\r
        $(OBJS)\monodll_collpaneg.obj \\r
@@ -2505,6 +2530,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_markupparser.obj \\r
        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r
+       $(OBJS)\monodll_modalhook.obj \\r
        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
@@ -2514,6 +2540,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
+       $(OBJS)\monodll_preferencescmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
        $(OBJS)\monodll_radiobtncmn.obj \\r
@@ -2537,6 +2564,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_tbarbase.obj \\r
        $(OBJS)\monodll_textcmn.obj \\r
        $(OBJS)\monodll_textentrycmn.obj \\r
+       $(OBJS)\monodll_textmeasurecmn.obj \\r
        $(OBJS)\monodll_toplvcmn.obj \\r
        $(OBJS)\monodll_treebase.obj \\r
        $(OBJS)\monodll_uiactioncmn.obj \\r
@@ -2565,6 +2593,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msgdlgg.obj \\r
        $(OBJS)\monodll_numdlgg.obj \\r
        $(OBJS)\monodll_progdlgg.obj \\r
+       $(OBJS)\monodll_preferencesg.obj \\r
        $(OBJS)\monodll_printps.obj \\r
        $(OBJS)\monodll_renderg.obj \\r
        $(OBJS)\monodll_richmsgdlgg.obj \\r
@@ -2581,7 +2610,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_treectlg.obj \\r
        $(OBJS)\monodll_treebkg.obj \\r
        $(OBJS)\monodll_vlbox.obj \\r
-       $(OBJS)\monodll_vscroll.obj\r
+       $(OBJS)\monodll_vscroll.obj \\r
+       $(OBJS)\monodll_xmlreshandler.obj\r
 !endif\r
 !if "$(WXUNIV)" == "0"\r
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
@@ -2729,6 +2759,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_webview_ie.obj \\r
        $(OBJS)\monolib_webview.obj \\r
        $(OBJS)\monolib_webviewarchivehandler.obj \\r
+       $(OBJS)\monolib_webviewfshandler.obj \\r
        $(OBJS)\monolib_debugrpt.obj \\r
        $(OBJS)\monolib_dbgrptg.obj \\r
        $(OBJS)\monolib_xh_animatctrl.obj \\r
@@ -2803,6 +2834,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_auibar.obj \\r
        $(OBJS)\monolib_tabmdi.obj \\r
        $(OBJS)\monolib_tabart.obj \\r
+       $(OBJS)\monolib_xh_auinotbk.obj \\r
        $(OBJS)\monolib_advprops.obj \\r
        $(OBJS)\monolib_editors.obj \\r
        $(OBJS)\monolib_manager.obj \\r
@@ -2821,6 +2853,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_page.obj \\r
        $(OBJS)\monolib_ribbon_panel.obj \\r
        $(OBJS)\monolib_ribbon_toolbar.obj \\r
+       $(OBJS)\monolib_xh_ribbon.obj \\r
        $(OBJS)\monolib_richtextbuffer.obj \\r
        $(OBJS)\monolib_richtextctrl.obj \\r
        $(OBJS)\monolib_richtextformatdlg.obj \\r
@@ -2831,6 +2864,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_richtextstyles.obj \\r
        $(OBJS)\monolib_richtextsymboldlg.obj \\r
        $(OBJS)\monolib_richtextxml.obj \\r
+       $(OBJS)\monolib_xh_richtext.obj \\r
        $(OBJS)\monolib_stc.obj \\r
        $(OBJS)\monolib_PlatWX.obj \\r
        $(OBJS)\monolib_ScintillaWX.obj\r
@@ -2870,6 +2904,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dropsrc.obj \\r
        $(OBJS)\monolib_droptgt.obj \\r
        $(OBJS)\monolib_oleutils.obj \\r
+       $(OBJS)\monolib_safearray.obj \\r
        $(OBJS)\monolib_palette.obj \\r
        $(OBJS)\monolib_pen.obj \\r
        $(OBJS)\monolib_popupwin.obj \\r
@@ -2878,6 +2913,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_region.obj \\r
        $(OBJS)\monolib_renderer.obj \\r
        $(OBJS)\monolib_settings.obj \\r
+       $(OBJS)\monolib_textmeasure.obj \\r
        $(OBJS)\monolib_tooltip.obj \\r
        $(OBJS)\monolib_toplevel.obj \\r
        $(OBJS)\monolib_uiaction.obj \\r
@@ -3031,6 +3067,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_markupparser.obj \\r
        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r
+       $(OBJS)\monolib_modalhook.obj \\r
        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
@@ -3040,6 +3077,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
+       $(OBJS)\monolib_preferencescmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
        $(OBJS)\monolib_radiobtncmn.obj \\r
@@ -3063,6 +3101,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_tbarbase.obj \\r
        $(OBJS)\monolib_textcmn.obj \\r
        $(OBJS)\monolib_textentrycmn.obj \\r
+       $(OBJS)\monolib_textmeasurecmn.obj \\r
        $(OBJS)\monolib_toplvcmn.obj \\r
        $(OBJS)\monolib_treebase.obj \\r
        $(OBJS)\monolib_uiactioncmn.obj \\r
@@ -3091,6 +3130,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msgdlgg.obj \\r
        $(OBJS)\monolib_numdlgg.obj \\r
        $(OBJS)\monolib_progdlgg.obj \\r
+       $(OBJS)\monolib_preferencesg.obj \\r
        $(OBJS)\monolib_printps.obj \\r
        $(OBJS)\monolib_renderg.obj \\r
        $(OBJS)\monolib_richmsgdlgg.obj \\r
@@ -3107,7 +3147,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_treectlg.obj \\r
        $(OBJS)\monolib_treebkg.obj \\r
        $(OBJS)\monolib_vlbox.obj \\r
-       $(OBJS)\monolib_vscroll.obj\r
+       $(OBJS)\monolib_vscroll.obj \\r
+       $(OBJS)\monolib_xmlreshandler.obj\r
 !endif\r
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \\r
@@ -3144,6 +3185,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dropsrc.obj \\r
        $(OBJS)\monolib_droptgt.obj \\r
        $(OBJS)\monolib_oleutils.obj \\r
+       $(OBJS)\monolib_safearray.obj \\r
        $(OBJS)\monolib_palette.obj \\r
        $(OBJS)\monolib_pen.obj \\r
        $(OBJS)\monolib_popupwin.obj \\r
@@ -3152,6 +3194,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_region.obj \\r
        $(OBJS)\monolib_renderer.obj \\r
        $(OBJS)\monolib_settings.obj \\r
+       $(OBJS)\monolib_textmeasure.obj \\r
        $(OBJS)\monolib_tooltip.obj \\r
        $(OBJS)\monolib_toplevel.obj \\r
        $(OBJS)\monolib_uiaction.obj \\r
@@ -3163,7 +3206,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.obj \\r
        $(OBJS)\monolib_automtn.obj \\r
        $(OBJS)\monolib_uuid.obj \\r
-       $(OBJS)\monolib_evtloop.obj \
+       $(OBJS)\monolib_evtloop.obj \\r
        $(OBJS)\monolib_generic_accel.obj \\r
        $(OBJS)\monolib_clrpickerg.obj \\r
        $(OBJS)\monolib_collpaneg.obj \\r
@@ -3299,6 +3342,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_markupparser.obj \\r
        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r
+       $(OBJS)\monolib_modalhook.obj \\r
        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
@@ -3308,6 +3352,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
+       $(OBJS)\monolib_preferencescmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
        $(OBJS)\monolib_radiobtncmn.obj \\r
@@ -3331,6 +3376,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_tbarbase.obj \\r
        $(OBJS)\monolib_textcmn.obj \\r
        $(OBJS)\monolib_textentrycmn.obj \\r
+       $(OBJS)\monolib_textmeasurecmn.obj \\r
        $(OBJS)\monolib_toplvcmn.obj \\r
        $(OBJS)\monolib_treebase.obj \\r
        $(OBJS)\monolib_uiactioncmn.obj \\r
@@ -3359,6 +3405,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msgdlgg.obj \\r
        $(OBJS)\monolib_numdlgg.obj \\r
        $(OBJS)\monolib_progdlgg.obj \\r
+       $(OBJS)\monolib_preferencesg.obj \\r
        $(OBJS)\monolib_printps.obj \\r
        $(OBJS)\monolib_renderg.obj \\r
        $(OBJS)\monolib_richmsgdlgg.obj \\r
@@ -3375,7 +3422,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_treectlg.obj \\r
        $(OBJS)\monolib_treebkg.obj \\r
        $(OBJS)\monolib_vlbox.obj \\r
-       $(OBJS)\monolib_vscroll.obj\r
+       $(OBJS)\monolib_vscroll.obj \\r
+       $(OBJS)\monolib_xmlreshandler.obj\r
 !endif\r
 !if "$(WXUNIV)" == "0"\r
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
@@ -3606,6 +3654,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dropsrc.obj \\r
        $(OBJS)\coredll_droptgt.obj \\r
        $(OBJS)\coredll_oleutils.obj \\r
+       $(OBJS)\coredll_safearray.obj \\r
        $(OBJS)\coredll_palette.obj \\r
        $(OBJS)\coredll_pen.obj \\r
        $(OBJS)\coredll_popupwin.obj \\r
@@ -3614,6 +3663,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_region.obj \\r
        $(OBJS)\coredll_renderer.obj \\r
        $(OBJS)\coredll_settings.obj \\r
+       $(OBJS)\coredll_textmeasure.obj \\r
        $(OBJS)\coredll_tooltip.obj \\r
        $(OBJS)\coredll_toplevel.obj \\r
        $(OBJS)\coredll_uiaction.obj \\r
@@ -3767,6 +3817,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_markupparser.obj \\r
        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r
+       $(OBJS)\coredll_modalhook.obj \\r
        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
@@ -3776,6 +3827,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
+       $(OBJS)\coredll_preferencescmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
        $(OBJS)\coredll_radiobtncmn.obj \\r
@@ -3799,6 +3851,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_tbarbase.obj \\r
        $(OBJS)\coredll_textcmn.obj \\r
        $(OBJS)\coredll_textentrycmn.obj \\r
+       $(OBJS)\coredll_textmeasurecmn.obj \\r
        $(OBJS)\coredll_toplvcmn.obj \\r
        $(OBJS)\coredll_treebase.obj \\r
        $(OBJS)\coredll_uiactioncmn.obj \\r
@@ -3827,6 +3880,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msgdlgg.obj \\r
        $(OBJS)\coredll_numdlgg.obj \\r
        $(OBJS)\coredll_progdlgg.obj \\r
+       $(OBJS)\coredll_preferencesg.obj \\r
        $(OBJS)\coredll_printps.obj \\r
        $(OBJS)\coredll_renderg.obj \\r
        $(OBJS)\coredll_richmsgdlgg.obj \\r
@@ -3843,7 +3897,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_treectlg.obj \\r
        $(OBJS)\coredll_treebkg.obj \\r
        $(OBJS)\coredll_vlbox.obj \\r
-       $(OBJS)\coredll_vscroll.obj\r
+       $(OBJS)\coredll_vscroll.obj \\r
+       $(OBJS)\coredll_xmlreshandler.obj\r
 !endif\r
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \\r
@@ -3880,6 +3935,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dropsrc.obj \\r
        $(OBJS)\coredll_droptgt.obj \\r
        $(OBJS)\coredll_oleutils.obj \\r
+       $(OBJS)\coredll_safearray.obj \\r
        $(OBJS)\coredll_palette.obj \\r
        $(OBJS)\coredll_pen.obj \\r
        $(OBJS)\coredll_popupwin.obj \\r
@@ -3888,6 +3944,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_region.obj \\r
        $(OBJS)\coredll_renderer.obj \\r
        $(OBJS)\coredll_settings.obj \\r
+       $(OBJS)\coredll_textmeasure.obj \\r
        $(OBJS)\coredll_tooltip.obj \\r
        $(OBJS)\coredll_toplevel.obj \\r
        $(OBJS)\coredll_uiaction.obj \\r
@@ -3899,7 +3956,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.obj \\r
        $(OBJS)\coredll_automtn.obj \\r
        $(OBJS)\coredll_uuid.obj \\r
-       $(OBJS)\coredll_evtloop.obj \
+       $(OBJS)\coredll_evtloop.obj \\r
        $(OBJS)\coredll_generic_accel.obj \\r
        $(OBJS)\coredll_clrpickerg.obj \\r
        $(OBJS)\coredll_collpaneg.obj \\r
@@ -4035,6 +4092,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_markupparser.obj \\r
        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r
+       $(OBJS)\coredll_modalhook.obj \\r
        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
@@ -4044,6 +4102,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
+       $(OBJS)\coredll_preferencescmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
        $(OBJS)\coredll_radiobtncmn.obj \\r
@@ -4067,6 +4126,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_tbarbase.obj \\r
        $(OBJS)\coredll_textcmn.obj \\r
        $(OBJS)\coredll_textentrycmn.obj \\r
+       $(OBJS)\coredll_textmeasurecmn.obj \\r
        $(OBJS)\coredll_toplvcmn.obj \\r
        $(OBJS)\coredll_treebase.obj \\r
        $(OBJS)\coredll_uiactioncmn.obj \\r
@@ -4095,6 +4155,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msgdlgg.obj \\r
        $(OBJS)\coredll_numdlgg.obj \\r
        $(OBJS)\coredll_progdlgg.obj \\r
+       $(OBJS)\coredll_preferencesg.obj \\r
        $(OBJS)\coredll_printps.obj \\r
        $(OBJS)\coredll_renderg.obj \\r
        $(OBJS)\coredll_richmsgdlgg.obj \\r
@@ -4111,7 +4172,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_treectlg.obj \\r
        $(OBJS)\coredll_treebkg.obj \\r
        $(OBJS)\coredll_vlbox.obj \\r
-       $(OBJS)\coredll_vscroll.obj\r
+       $(OBJS)\coredll_vscroll.obj \\r
+       $(OBJS)\coredll_xmlreshandler.obj\r
 !endif\r
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"\r
 __corelib___depname = \\r
@@ -4158,6 +4220,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dropsrc.obj \\r
        $(OBJS)\corelib_droptgt.obj \\r
        $(OBJS)\corelib_oleutils.obj \\r
+       $(OBJS)\corelib_safearray.obj \\r
        $(OBJS)\corelib_palette.obj \\r
        $(OBJS)\corelib_pen.obj \\r
        $(OBJS)\corelib_popupwin.obj \\r
@@ -4166,6 +4229,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_region.obj \\r
        $(OBJS)\corelib_renderer.obj \\r
        $(OBJS)\corelib_settings.obj \\r
+       $(OBJS)\corelib_textmeasure.obj \\r
        $(OBJS)\corelib_tooltip.obj \\r
        $(OBJS)\corelib_toplevel.obj \\r
        $(OBJS)\corelib_uiaction.obj \\r
@@ -4319,6 +4383,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_markupparser.obj \\r
        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r
+       $(OBJS)\corelib_modalhook.obj \\r
        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
@@ -4328,6 +4393,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
+       $(OBJS)\corelib_preferencescmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
        $(OBJS)\corelib_radiobtncmn.obj \\r
@@ -4351,6 +4417,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_tbarbase.obj \\r
        $(OBJS)\corelib_textcmn.obj \\r
        $(OBJS)\corelib_textentrycmn.obj \\r
+       $(OBJS)\corelib_textmeasurecmn.obj \\r
        $(OBJS)\corelib_toplvcmn.obj \\r
        $(OBJS)\corelib_treebase.obj \\r
        $(OBJS)\corelib_uiactioncmn.obj \\r
@@ -4379,6 +4446,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msgdlgg.obj \\r
        $(OBJS)\corelib_numdlgg.obj \\r
        $(OBJS)\corelib_progdlgg.obj \\r
+       $(OBJS)\corelib_preferencesg.obj \\r
        $(OBJS)\corelib_printps.obj \\r
        $(OBJS)\corelib_renderg.obj \\r
        $(OBJS)\corelib_richmsgdlgg.obj \\r
@@ -4395,7 +4463,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_treectlg.obj \\r
        $(OBJS)\corelib_treebkg.obj \\r
        $(OBJS)\corelib_vlbox.obj \\r
-       $(OBJS)\corelib_vscroll.obj\r
+       $(OBJS)\corelib_vscroll.obj \\r
+       $(OBJS)\corelib_xmlreshandler.obj\r
 !endif\r
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \\r
@@ -4432,6 +4501,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dropsrc.obj \\r
        $(OBJS)\corelib_droptgt.obj \\r
        $(OBJS)\corelib_oleutils.obj \\r
+       $(OBJS)\corelib_safearray.obj \\r
        $(OBJS)\corelib_palette.obj \\r
        $(OBJS)\corelib_pen.obj \\r
        $(OBJS)\corelib_popupwin.obj \\r
@@ -4440,6 +4510,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_region.obj \\r
        $(OBJS)\corelib_renderer.obj \\r
        $(OBJS)\corelib_settings.obj \\r
+       $(OBJS)\corelib_textmeasure.obj \\r
        $(OBJS)\corelib_tooltip.obj \\r
        $(OBJS)\corelib_toplevel.obj \\r
        $(OBJS)\corelib_uiaction.obj \\r
@@ -4451,7 +4522,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.obj \\r
        $(OBJS)\corelib_automtn.obj \\r
        $(OBJS)\corelib_uuid.obj \\r
-       $(OBJS)\corelib_evtloop.obj \
+       $(OBJS)\corelib_evtloop.obj \\r
        $(OBJS)\corelib_generic_accel.obj \\r
        $(OBJS)\corelib_clrpickerg.obj \\r
        $(OBJS)\corelib_collpaneg.obj \\r
@@ -4587,6 +4658,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_markupparser.obj \\r
        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r
+       $(OBJS)\corelib_modalhook.obj \\r
        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
@@ -4596,6 +4668,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
+       $(OBJS)\corelib_preferencescmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
        $(OBJS)\corelib_radiobtncmn.obj \\r
@@ -4619,6 +4692,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_tbarbase.obj \\r
        $(OBJS)\corelib_textcmn.obj \\r
        $(OBJS)\corelib_textentrycmn.obj \\r
+       $(OBJS)\corelib_textmeasurecmn.obj \\r
        $(OBJS)\corelib_toplvcmn.obj \\r
        $(OBJS)\corelib_treebase.obj \\r
        $(OBJS)\corelib_uiactioncmn.obj \\r
@@ -4647,6 +4721,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msgdlgg.obj \\r
        $(OBJS)\corelib_numdlgg.obj \\r
        $(OBJS)\corelib_progdlgg.obj \\r
+       $(OBJS)\corelib_preferencesg.obj \\r
        $(OBJS)\corelib_printps.obj \\r
        $(OBJS)\corelib_renderg.obj \\r
        $(OBJS)\corelib_richmsgdlgg.obj \\r
@@ -4663,7 +4738,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_treectlg.obj \\r
        $(OBJS)\corelib_treebkg.obj \\r
        $(OBJS)\corelib_vlbox.obj \\r
-       $(OBJS)\corelib_vscroll.obj\r
+       $(OBJS)\corelib_vscroll.obj \\r
+       $(OBJS)\corelib_xmlreshandler.obj\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 ____wxcore_namedll_DEP = $(__coredll___depname)\r
@@ -5742,7 +5818,7 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_108)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(MONODLL_OBJECTS) $(MONODLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+       $(MONODLL_OBJECTS) $(MONODLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 <<\r
 !endif\r
 \r
@@ -5795,7 +5871,7 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_201)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(COREDLL_OBJECTS) $(COREDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
+       $(COREDLL_OBJECTS) $(COREDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 <<\r
 !endif\r
 \r
@@ -5814,7 +5890,7 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_232)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
+       $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
 <<\r
 !endif\r
 \r
@@ -5833,7 +5909,7 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_263)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
+       $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib\r
 <<\r
 !endif\r
 \r
@@ -5852,7 +5928,7 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_294)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
+       $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
 <<\r
 !endif\r
 \r
@@ -5871,7 +5947,7 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\webviewdll_dummy.obj  $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_325)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(WEBVIEWDLL_OBJECTS) $(WEBVIEWDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+       $(WEBVIEWDLL_OBJECTS) $(WEBVIEWDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 <<\r
 !endif\r
 \r
@@ -5890,7 +5966,7 @@ wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_356)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(QADLL_OBJECTS) $(QADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
+       $(QADLL_OBJECTS) $(QADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib\r
 <<\r
 !endif\r
 \r
@@ -5928,7 +6004,7 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_418)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
+       $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
 <<\r
 !endif\r
 \r
@@ -5947,7 +6023,7 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_449)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
+       $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
 <<\r
 !endif\r
 \r
@@ -5966,7 +6042,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj  $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_480)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
+       $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
 <<\r
 !endif\r
 \r
@@ -5985,7 +6061,7 @@ wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj  $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_511)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r
+       $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib\r
 <<\r
 !endif\r
 \r
@@ -6004,7 +6080,7 @@ wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_542)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
+       $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib\r
 <<\r
 !endif\r
 \r
@@ -6023,7 +6099,7 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_573)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(STCDLL_OBJECTS) $(STCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
+       $(STCDLL_OBJECTS) $(STCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).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 /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
 <<\r
 !endif\r
 \r
@@ -6042,7 +6118,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"\r
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)\r
        link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_604)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(GLDLL_OBJECTS) $(GLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib\r
+       $(GLDLL_OBJECTS) $(GLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib\r
 <<\r
 !endif\r
 \r
@@ -6092,6 +6168,8 @@ build_cfg_file: $(SETUPHDIR)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
        @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)\r
+       @echo TOOLKIT=MSW >>$(BUILD_CFG_FILE)\r
+       @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)\r
        @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)\r
        @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)\r
@@ -6101,20 +6179,20 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)
+       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)\r
        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)
+       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
-       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)
-       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)
-       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
-       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
-       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
+       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)\r
+       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)\r
+       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r
+       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=vc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
@@ -6406,12 +6484,21 @@ $(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c
 $(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_getimage.c\r
 \r
+$(OBJS)\wxtiff_tif_jbig.obj: ..\..\src\tiff\libtiff\tif_jbig.c\r
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jbig.c\r
+\r
 $(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg.c\r
 \r
+$(OBJS)\wxtiff_tif_jpeg_12.obj: ..\..\src\tiff\libtiff\tif_jpeg_12.c\r
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg_12.c\r
+\r
 $(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_luv.c\r
 \r
+$(OBJS)\wxtiff_tif_lzma.obj: ..\..\src\tiff\libtiff\tif_lzma.c\r
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzma.c\r
+\r
 $(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c\r
 \r
@@ -7633,6 +7720,9 @@ $(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\monodll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\monodll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
@@ -7855,6 +7945,9 @@ $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 $(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
 \r
+$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r
 $(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
 \r
@@ -7909,6 +8002,9 @@ $(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp
 $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r
+$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
 $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r
@@ -7939,6 +8035,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 $(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
 \r
+$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
 $(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp\r
 \r
@@ -8119,6 +8218,11 @@ $(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_safearray.obj: ..\..\src\msw\ole\safearray.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp\r
@@ -8159,6 +8263,11 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
@@ -8240,11 +8349,11 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -8654,6 +8763,11 @@ $(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_modalhook.obj: ..\..\src\common\modalhook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\modalhook.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r
@@ -8699,6 +8813,11 @@ $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
@@ -8814,6 +8933,11 @@ $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
@@ -8954,6 +9078,11 @@ $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp\r
@@ -9039,6 +9168,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
@@ -10051,6 +10185,9 @@ $(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\monolib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\monolib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
@@ -10273,6 +10410,9 @@ $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 $(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
 \r
+$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r
 $(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp\r
 \r
@@ -10327,6 +10467,9 @@ $(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp
 $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r
+$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
 $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp\r
 \r
@@ -10357,6 +10500,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
 $(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
 \r
+$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
 $(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp\r
 \r
@@ -10537,6 +10683,11 @@ $(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_safearray.obj: ..\..\src\msw\ole\safearray.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp\r
@@ -10577,6 +10728,11 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
@@ -10658,11 +10814,11 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -11072,6 +11228,11 @@ $(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_modalhook.obj: ..\..\src\common\modalhook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\modalhook.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r
@@ -11117,6 +11278,11 @@ $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
@@ -11232,6 +11398,11 @@ $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
@@ -11372,6 +11543,11 @@ $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp\r
@@ -11457,6 +11633,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
@@ -12922,6 +13103,11 @@ $(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_safearray.obj: ..\..\src\msw\ole\safearray.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp\r
@@ -12962,6 +13148,11 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
@@ -13043,11 +13234,11 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -13457,6 +13648,11 @@ $(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_modalhook.obj: ..\..\src\common\modalhook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\modalhook.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r
@@ -13502,6 +13698,11 @@ $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
@@ -13617,6 +13818,11 @@ $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
@@ -13757,6 +13963,11 @@ $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp\r
@@ -13842,6 +14053,11 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
 $(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -14337,6 +14553,11 @@ $(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_safearray.obj: ..\..\src\msw\ole\safearray.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp\r
@@ -14377,6 +14598,11 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
@@ -14458,11 +14684,11 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -14872,6 +15098,11 @@ $(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_modalhook.obj: ..\..\src\common\modalhook.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\modalhook.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp\r
@@ -14917,6 +15148,11 @@ $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp\r
@@ -15032,6 +15268,11 @@ $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
@@ -15172,6 +15413,11 @@ $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp\r
@@ -15257,6 +15503,11 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
 $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -15773,6 +16024,9 @@ $(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\webviewdll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\webviewdll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -15785,6 +16039,9 @@ $(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\webviewlib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\webviewlib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -16253,6 +16510,9 @@ $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 $(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
 \r
+$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r
 $(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -16277,6 +16537,9 @@ $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 $(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp\r
 \r
+$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp\r
+\r
 $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -16313,6 +16576,9 @@ $(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp
 $(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r
+$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
 $(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -16346,6 +16612,9 @@ $(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp
 $(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp\r
 \r
+$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp\r
+\r
 $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -16439,6 +16708,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
 $(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
 \r
+$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
 $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -16472,6 +16744,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
 $(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
 \r
+$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
 $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r