X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bfd90b3e73c6df033d2ba09005a7b22fb42c161..91270d2d17374f24a4de5108ea1a332190b827a6:/Makefile.in diff --git a/Makefile.in b/Makefile.in index e6c0c028d0..85917f0d8a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -185,8 +185,11 @@ WXTIFF_OBJECTS = \ wxtiff_tif_fax3sm.o \ wxtiff_tif_flush.o \ wxtiff_tif_getimage.o \ + wxtiff_tif_jbig.o \ wxtiff_tif_jpeg.o \ + wxtiff_tif_jpeg_12.o \ wxtiff_tif_luv.o \ + wxtiff_tif_lzma.o \ wxtiff_tif_lzw.o \ wxtiff_tif_next.o \ wxtiff_tif_ojpeg.o \ @@ -496,6 +499,7 @@ ALL_BASE_HEADERS = \ wx/meta/int2type.h \ wx/meta/movable.h \ wx/meta/pod.h \ + wx/meta/removeref.h \ wx/fswatcher.h \ wx/generic/fswatcher.h \ $(BASE_PLATFORM_HDR) \ @@ -676,6 +680,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/meta/int2type.h \ wx/meta/movable.h \ wx/meta/pod.h \ + wx/meta/removeref.h \ wx/fswatcher.h \ wx/generic/fswatcher.h \ wx/unix/app.h \ @@ -1866,6 +1871,7 @@ AUIDLL_OBJECTS = \ auidll_auibar.o \ auidll_tabmdi.o \ auidll_tabart.o \ + auidll_xh_auinotbk.o \ $(__AUI_GTK_SRC_OBJECTS_2) AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname) AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -1881,6 +1887,7 @@ AUILIB_OBJECTS = \ auilib_auibar.o \ auilib_tabmdi.o \ auilib_tabart.o \ + auilib_xh_auinotbk.o \ $(__AUI_GTK_SRC_OBJECTS_3) AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname) RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \ @@ -1900,7 +1907,8 @@ RIBBONDLL_OBJECTS = \ ribbondll_gallery.o \ ribbondll_page.o \ ribbondll_panel.o \ - ribbondll_toolbar.o + ribbondll_toolbar.o \ + ribbondll_xh_ribbon.o RIBBONDLL_ODEP = $(_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname) RIBBONLIB_CXXFLAGS = $(__ribbonlib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1917,7 +1925,8 @@ RIBBONLIB_OBJECTS = \ ribbonlib_gallery.o \ ribbonlib_page.o \ ribbonlib_panel.o \ - ribbonlib_toolbar.o + ribbonlib_toolbar.o \ + ribbonlib_xh_ribbon.o RIBBONLIB_ODEP = $(_____pch_wxprec_ribbonlib_wx_wxprec_h_gch___depname) PROPGRIDDLL_CXXFLAGS = $(__propgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1968,7 +1977,8 @@ RICHTEXTDLL_OBJECTS = \ richtextdll_richtextstyledlg.o \ richtextdll_richtextstyles.o \ richtextdll_richtextsymboldlg.o \ - richtextdll_richtextxml.o + richtextdll_richtextxml.o \ + richtextdll_xh_richtext.o RICHTEXTDLL_ODEP = $(_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname) RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1985,7 +1995,8 @@ RICHTEXTLIB_OBJECTS = \ richtextlib_richtextstyledlg.o \ richtextlib_richtextstyles.o \ richtextlib_richtextsymboldlg.o \ - richtextlib_richtextxml.o + richtextlib_richtextxml.o \ + richtextlib_xh_richtext.o RICHTEXTLIB_ODEP = $(_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname) STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -2119,12 +2130,10 @@ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname = \ @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = install_wxtiff @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__uninstall_wxtiff___depname \ @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = uninstall_wxtiff -@COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o +@COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o -@COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o -@COND_PLATFORM_MSDOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_msdos.o COND_wxUSE_EXPAT_builtin___wxexpat___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_wxUSE_EXPAT_builtin@__wxexpat___depname = $(COND_wxUSE_EXPAT_builtin___wxexpat___depname) @@ -3151,6 +3160,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/ole/dropsrc.h \ wx/msw/ole/droptgt.h \ wx/msw/ole/oleutils.h \ + wx/msw/ole/safearray.h \ wx/msw/ownerdrw.h \ wx/msw/palette.h \ wx/msw/panel.h \ @@ -3668,6 +3678,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/ole/dropsrc.h \ wx/msw/ole/droptgt.h \ wx/msw/ole/oleutils.h \ + wx/msw/ole/safearray.h \ wx/msw/ownerdrw.h \ wx/msw/palette.h \ wx/msw/panel.h \ @@ -4021,7 +4032,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/bmpbuttn.h \ wx/brush.h \ wx/button.h \ - wx/cairo.h \ wx/checkbox.h \ wx/checklst.h \ wx/choicdlg.h \ @@ -4241,6 +4251,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/vscroll.h \ wx/xpmdecod.h \ wx/xpmhand.h \ + wx/xrc/xmlreshandler.h \ $(LOWLEVEL_HDR) \ $(GUI_CORE_HEADERS) \ $(ADVANCED_HDR) \ @@ -4340,6 +4351,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/aui/tabmdi.h \ wx/aui/aui.h \ wx/aui/tabart.h \ + wx/xrc/xh_auinotbk.h \ $(AUI_GTK_HDR) \ wx/propgrid/advprops.h \ wx/propgrid/editors.h \ @@ -4359,6 +4371,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/ribbon/page.h \ wx/ribbon/panel.h \ wx/ribbon/toolbar.h \ + wx/xrc/xh_ribbon.h \ wx/richtext/richtextbackgroundpage.h \ wx/richtext/richtextborderspage.h \ wx/richtext/richtextbuffer.h \ @@ -4378,8 +4391,10 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/richtext/richtextstylepage.h \ wx/richtext/richtextstyles.h \ wx/richtext/richtextsymboldlg.h \ + wx/richtext/richtexttabspage.h \ wx/richtext/richtextuicustomization.h \ wx/richtext/richtextxml.h \ + wx/xrc/xh_richtext.h \ wx/stc/stc.h \ $(WEBVIEW_HDR_PLATFORM) \ wx/webview.h \ @@ -4660,6 +4675,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_auibar.o \ monodll_tabmdi.o \ monodll_tabart.o \ + monodll_xh_auinotbk.o \ $(__AUI_GTK_SRC_OBJECTS) \ monodll_advprops.o \ monodll_editors.o \ @@ -4679,6 +4695,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_page.o \ monodll_ribbon_panel.o \ monodll_ribbon_toolbar.o \ + monodll_xh_ribbon.o \ monodll_richtextbuffer.o \ monodll_richtextctrl.o \ monodll_richtextformatdlg.o \ @@ -4689,6 +4706,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_richtextstyles.o \ monodll_richtextsymboldlg.o \ monodll_richtextxml.o \ + monodll_xh_richtext.o \ monodll_stc.o \ monodll_PlatWX.o \ monodll_ScintillaWX.o @@ -4811,6 +4829,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_tbarbase.o \ monodll_textcmn.o \ monodll_textentrycmn.o \ + monodll_textmeasurecmn.o \ monodll_toplvcmn.o \ monodll_treebase.o \ monodll_uiactioncmn.o \ @@ -4855,7 +4874,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_treectlg.o \ monodll_treebkg.o \ monodll_vlbox.o \ - monodll_vscroll.o + monodll_vscroll.o \ + monodll_xmlreshandler.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS_1) \ @@ -5028,6 +5048,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_tbarbase.o \ monodll_textcmn.o \ monodll_textentrycmn.o \ + monodll_textmeasurecmn.o \ monodll_toplvcmn.o \ monodll_treebase.o \ monodll_uiactioncmn.o \ @@ -5072,7 +5093,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_treectlg.o \ monodll_treebkg.o \ monodll_vlbox.o \ - monodll_vscroll.o + monodll_vscroll.o \ + monodll_xmlreshandler.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_COCOA@ monodll_hid.o monodll_utilsexc_cf.o @@ -5083,6 +5105,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \ monodll_generic_icon.o \ monodll_generic_imaglist.o \ monodll_mask.o \ + monodll_generic_textmeasure.o \ monodll_dfb_app.o \ monodll_dfb_bitmap.o \ monodll_dfb_brush.o \ @@ -5116,6 +5139,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS = \ monodll_utilsx11.o \ monodll_generic_icon.o \ monodll_paletteg.o \ + monodll_generic_textmeasure.o \ monodll_gtk1_app.o \ monodll_gtk1_bitmap.o \ monodll_gtk1_brush.o \ @@ -5173,6 +5197,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \ monodll_gtk_region.o \ monodll_gtk_renderer.o \ monodll_gtk_settings.o \ + monodll_gtk_textmeasure.o \ monodll_gtk_timer.o \ monodll_gtk_tooltip.o \ monodll_gtk_toplevel.o \ @@ -5210,6 +5235,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS = \ monodll_gtk_region.o \ monodll_gtk_renderer.o \ monodll_gtk_settings.o \ + monodll_gtk_textmeasure.o \ monodll_gtk_timer.o \ monodll_gtk_tooltip.o \ monodll_gtk_toplevel.o \ @@ -5226,6 +5252,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS = \ monodll_unix_fontutil.o \ monodll_uiactionx11.o \ monodll_utilsx11.o \ + monodll_generic_textmeasure.o \ monodll_x11_bitmap.o \ monodll_x11_brush.o \ monodll_x11_palette.o \ @@ -5267,6 +5294,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_dropsrc.o \ monodll_droptgt.o \ monodll_oleutils.o \ + monodll_safearray.o \ monodll_msw_palette.o \ monodll_msw_pen.o \ monodll_msw_popupwin.o \ @@ -5275,6 +5303,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_msw_region.o \ monodll_msw_renderer.o \ monodll_msw_settings.o \ + monodll_msw_textmeasure.o \ monodll_msw_tooltip.o \ monodll_msw_toplevel.o \ monodll_uiaction.o \ @@ -5328,6 +5357,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \ monodll_dropsrc.o \ monodll_droptgt.o \ monodll_oleutils.o \ + monodll_safearray.o \ monodll_msw_palette.o \ monodll_msw_pen.o \ monodll_msw_popupwin.o \ @@ -5336,6 +5366,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \ monodll_msw_region.o \ monodll_msw_renderer.o \ monodll_msw_settings.o \ + monodll_msw_textmeasure.o \ monodll_msw_tooltip.o \ monodll_msw_toplevel.o \ monodll_uiaction.o \ @@ -5354,6 +5385,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_uiactionx11.o \ monodll_utilsx11.o \ monodll_generic_icon.o \ + monodll_generic_textmeasure.o \ monodll_generic_timer.o \ monodll_x11_app.o \ monodll_x11_bitmap.o \ @@ -5471,7 +5503,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_generic_listctrl.o \ monodll_paletteg.o \ monodll_regiong.o \ - monodll_generic_statusbr.o + monodll_generic_statusbr.o \ + monodll_generic_textmeasure.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_generic_accel.o \ @@ -5866,6 +5899,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_mdig.o \ monodll_prntdlgg.o \ monodll_generic_statusbr.o \ + monodll_generic_textmeasure.o \ monodll_os2_accel.o \ monodll_os2_app.o \ monodll_os2_bitmap.o \ @@ -6019,6 +6053,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_generic_icon.o \ monodll_generic_imaglist.o \ monodll_mask.o \ + monodll_generic_textmeasure.o \ monodll_dfb_app.o \ monodll_dfb_bitmap.o \ monodll_dfb_brush.o \ @@ -6052,6 +6087,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 = \ monodll_utilsx11.o \ monodll_generic_icon.o \ monodll_paletteg.o \ + monodll_generic_textmeasure.o \ monodll_gtk1_app.o \ monodll_gtk1_bitmap.o \ monodll_gtk1_brush.o \ @@ -6109,6 +6145,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_gtk_region.o \ monodll_gtk_renderer.o \ monodll_gtk_settings.o \ + monodll_gtk_textmeasure.o \ monodll_gtk_timer.o \ monodll_gtk_tooltip.o \ monodll_gtk_toplevel.o \ @@ -6146,6 +6183,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_gtk_region.o \ monodll_gtk_renderer.o \ monodll_gtk_settings.o \ + monodll_gtk_textmeasure.o \ monodll_gtk_timer.o \ monodll_gtk_tooltip.o \ monodll_gtk_toplevel.o \ @@ -6162,6 +6200,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_unix_fontutil.o \ monodll_uiactionx11.o \ monodll_utilsx11.o \ + monodll_generic_textmeasure.o \ monodll_x11_bitmap.o \ monodll_x11_brush.o \ monodll_x11_palette.o \ @@ -6203,6 +6242,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_dropsrc.o \ monodll_droptgt.o \ monodll_oleutils.o \ + monodll_safearray.o \ monodll_msw_palette.o \ monodll_msw_pen.o \ monodll_msw_popupwin.o \ @@ -6211,6 +6251,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_msw_region.o \ monodll_msw_renderer.o \ monodll_msw_settings.o \ + monodll_msw_textmeasure.o \ monodll_msw_tooltip.o \ monodll_msw_toplevel.o \ monodll_uiaction.o \ @@ -6264,6 +6305,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_dropsrc.o \ monodll_droptgt.o \ monodll_oleutils.o \ + monodll_safearray.o \ monodll_msw_palette.o \ monodll_msw_pen.o \ monodll_msw_popupwin.o \ @@ -6272,6 +6314,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_msw_region.o \ monodll_msw_renderer.o \ monodll_msw_settings.o \ + monodll_msw_textmeasure.o \ monodll_msw_tooltip.o \ monodll_msw_toplevel.o \ monodll_uiaction.o \ @@ -6290,6 +6333,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_uiactionx11.o \ monodll_utilsx11.o \ monodll_generic_icon.o \ + monodll_generic_textmeasure.o \ monodll_generic_timer.o \ monodll_x11_app.o \ monodll_x11_bitmap.o \ @@ -6866,6 +6910,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_auibar.o \ monolib_tabmdi.o \ monolib_tabart.o \ + monolib_xh_auinotbk.o \ $(__AUI_GTK_SRC_OBJECTS_1) \ monolib_advprops.o \ monolib_editors.o \ @@ -6885,6 +6930,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_page.o \ monolib_ribbon_panel.o \ monolib_ribbon_toolbar.o \ + monolib_xh_ribbon.o \ monolib_richtextbuffer.o \ monolib_richtextctrl.o \ monolib_richtextformatdlg.o \ @@ -6895,6 +6941,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_richtextstyles.o \ monolib_richtextsymboldlg.o \ monolib_richtextxml.o \ + monolib_xh_richtext.o \ monolib_stc.o \ monolib_PlatWX.o \ monolib_ScintillaWX.o @@ -7017,6 +7064,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_tbarbase.o \ monolib_textcmn.o \ monolib_textentrycmn.o \ + monolib_textmeasurecmn.o \ monolib_toplvcmn.o \ monolib_treebase.o \ monolib_uiactioncmn.o \ @@ -7061,7 +7109,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_treectlg.o \ monolib_treebkg.o \ monolib_vlbox.o \ - monolib_vscroll.o + monolib_vscroll.o \ + monolib_xmlreshandler.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ $(__LOWLEVEL_SRC_OBJECTS_3) \ @@ -7234,6 +7283,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_tbarbase.o \ monolib_textcmn.o \ monolib_textentrycmn.o \ + monolib_textmeasurecmn.o \ monolib_toplvcmn.o \ monolib_treebase.o \ monolib_uiactioncmn.o \ @@ -7278,7 +7328,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_treectlg.o \ monolib_treebkg.o \ monolib_vlbox.o \ - monolib_vscroll.o + monolib_vscroll.o \ + monolib_xmlreshandler.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ @COND_TOOLKIT_COCOA@ monolib_hid.o monolib_utilsexc_cf.o @@ -7289,6 +7340,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_generic_icon.o \ monolib_generic_imaglist.o \ monolib_mask.o \ + monolib_generic_textmeasure.o \ monolib_dfb_app.o \ monolib_dfb_bitmap.o \ monolib_dfb_brush.o \ @@ -7322,6 +7374,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 = \ monolib_utilsx11.o \ monolib_generic_icon.o \ monolib_paletteg.o \ + monolib_generic_textmeasure.o \ monolib_gtk1_app.o \ monolib_gtk1_bitmap.o \ monolib_gtk1_brush.o \ @@ -7379,6 +7432,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_gtk_region.o \ monolib_gtk_renderer.o \ monolib_gtk_settings.o \ + monolib_gtk_textmeasure.o \ monolib_gtk_timer.o \ monolib_gtk_tooltip.o \ monolib_gtk_toplevel.o \ @@ -7416,6 +7470,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_gtk_region.o \ monolib_gtk_renderer.o \ monolib_gtk_settings.o \ + monolib_gtk_textmeasure.o \ monolib_gtk_timer.o \ monolib_gtk_tooltip.o \ monolib_gtk_toplevel.o \ @@ -7432,6 +7487,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_unix_fontutil.o \ monolib_uiactionx11.o \ monolib_utilsx11.o \ + monolib_generic_textmeasure.o \ monolib_x11_bitmap.o \ monolib_x11_brush.o \ monolib_x11_palette.o \ @@ -7473,6 +7529,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_dropsrc.o \ monolib_droptgt.o \ monolib_oleutils.o \ + monolib_safearray.o \ monolib_msw_palette.o \ monolib_msw_pen.o \ monolib_msw_popupwin.o \ @@ -7481,6 +7538,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_msw_region.o \ monolib_msw_renderer.o \ monolib_msw_settings.o \ + monolib_msw_textmeasure.o \ monolib_msw_tooltip.o \ monolib_msw_toplevel.o \ monolib_uiaction.o \ @@ -7534,6 +7592,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_dropsrc.o \ monolib_droptgt.o \ monolib_oleutils.o \ + monolib_safearray.o \ monolib_msw_palette.o \ monolib_msw_pen.o \ monolib_msw_popupwin.o \ @@ -7542,6 +7601,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_msw_region.o \ monolib_msw_renderer.o \ monolib_msw_settings.o \ + monolib_msw_textmeasure.o \ monolib_msw_tooltip.o \ monolib_msw_toplevel.o \ monolib_uiaction.o \ @@ -7560,6 +7620,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_uiactionx11.o \ monolib_utilsx11.o \ monolib_generic_icon.o \ + monolib_generic_textmeasure.o \ monolib_generic_timer.o \ monolib_x11_app.o \ monolib_x11_bitmap.o \ @@ -7677,7 +7738,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_generic_listctrl.o \ monolib_paletteg.o \ monolib_regiong.o \ - monolib_generic_statusbr.o + monolib_generic_statusbr.o \ + monolib_generic_textmeasure.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_generic_accel.o \ @@ -8072,6 +8134,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_mdig.o \ monolib_prntdlgg.o \ monolib_generic_statusbr.o \ + monolib_generic_textmeasure.o \ monolib_os2_accel.o \ monolib_os2_app.o \ monolib_os2_bitmap.o \ @@ -8225,6 +8288,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_generic_icon.o \ monolib_generic_imaglist.o \ monolib_mask.o \ + monolib_generic_textmeasure.o \ monolib_dfb_app.o \ monolib_dfb_bitmap.o \ monolib_dfb_brush.o \ @@ -8258,6 +8322,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 = \ monolib_utilsx11.o \ monolib_generic_icon.o \ monolib_paletteg.o \ + monolib_generic_textmeasure.o \ monolib_gtk1_app.o \ monolib_gtk1_bitmap.o \ monolib_gtk1_brush.o \ @@ -8315,6 +8380,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_gtk_region.o \ monolib_gtk_renderer.o \ monolib_gtk_settings.o \ + monolib_gtk_textmeasure.o \ monolib_gtk_timer.o \ monolib_gtk_tooltip.o \ monolib_gtk_toplevel.o \ @@ -8352,6 +8418,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_gtk_region.o \ monolib_gtk_renderer.o \ monolib_gtk_settings.o \ + monolib_gtk_textmeasure.o \ monolib_gtk_timer.o \ monolib_gtk_tooltip.o \ monolib_gtk_toplevel.o \ @@ -8368,6 +8435,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_unix_fontutil.o \ monolib_uiactionx11.o \ monolib_utilsx11.o \ + monolib_generic_textmeasure.o \ monolib_x11_bitmap.o \ monolib_x11_brush.o \ monolib_x11_palette.o \ @@ -8409,6 +8477,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_dropsrc.o \ monolib_droptgt.o \ monolib_oleutils.o \ + monolib_safearray.o \ monolib_msw_palette.o \ monolib_msw_pen.o \ monolib_msw_popupwin.o \ @@ -8417,6 +8486,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_msw_region.o \ monolib_msw_renderer.o \ monolib_msw_settings.o \ + monolib_msw_textmeasure.o \ monolib_msw_tooltip.o \ monolib_msw_toplevel.o \ monolib_uiaction.o \ @@ -8470,6 +8540,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_dropsrc.o \ monolib_droptgt.o \ monolib_oleutils.o \ + monolib_safearray.o \ monolib_msw_palette.o \ monolib_msw_pen.o \ monolib_msw_popupwin.o \ @@ -8478,6 +8549,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_msw_region.o \ monolib_msw_renderer.o \ monolib_msw_settings.o \ + monolib_msw_textmeasure.o \ monolib_msw_tooltip.o \ monolib_msw_toplevel.o \ monolib_uiaction.o \ @@ -8496,6 +8568,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_uiactionx11.o \ monolib_utilsx11.o \ monolib_generic_icon.o \ + monolib_generic_textmeasure.o \ monolib_generic_timer.o \ monolib_x11_app.o \ monolib_x11_bitmap.o \ @@ -9398,6 +9471,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_tbarbase.o \ coredll_textcmn.o \ coredll_textentrycmn.o \ + coredll_textmeasurecmn.o \ coredll_toplvcmn.o \ coredll_treebase.o \ coredll_uiactioncmn.o \ @@ -9442,7 +9516,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_treectlg.o \ coredll_treebkg.o \ coredll_vlbox.o \ - coredll_vscroll.o + coredll_vscroll.o \ + coredll_xmlreshandler.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_5) \ @@ -9615,6 +9690,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_tbarbase.o \ coredll_textcmn.o \ coredll_textentrycmn.o \ + coredll_textmeasurecmn.o \ coredll_toplvcmn.o \ coredll_treebase.o \ coredll_uiactioncmn.o \ @@ -9659,7 +9735,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_treectlg.o \ coredll_treebkg.o \ coredll_vlbox.o \ - coredll_vscroll.o + coredll_vscroll.o \ + coredll_xmlreshandler.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ @COND_TOOLKIT_COCOA@ coredll_hid.o coredll_utilsexc_cf.o @@ -9670,6 +9747,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_generic_icon.o \ coredll_generic_imaglist.o \ coredll_mask.o \ + coredll_generic_textmeasure.o \ coredll_dfb_app.o \ coredll_dfb_bitmap.o \ coredll_dfb_brush.o \ @@ -9703,6 +9781,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 = \ coredll_utilsx11.o \ coredll_generic_icon.o \ coredll_paletteg.o \ + coredll_generic_textmeasure.o \ coredll_gtk1_app.o \ coredll_gtk1_bitmap.o \ coredll_gtk1_brush.o \ @@ -9760,6 +9839,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_gtk_region.o \ coredll_gtk_renderer.o \ coredll_gtk_settings.o \ + coredll_gtk_textmeasure.o \ coredll_gtk_timer.o \ coredll_gtk_tooltip.o \ coredll_gtk_toplevel.o \ @@ -9797,6 +9877,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_gtk_region.o \ coredll_gtk_renderer.o \ coredll_gtk_settings.o \ + coredll_gtk_textmeasure.o \ coredll_gtk_timer.o \ coredll_gtk_tooltip.o \ coredll_gtk_toplevel.o \ @@ -9813,6 +9894,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_unix_fontutil.o \ coredll_uiactionx11.o \ coredll_utilsx11.o \ + coredll_generic_textmeasure.o \ coredll_x11_bitmap.o \ coredll_x11_brush.o \ coredll_x11_palette.o \ @@ -9854,6 +9936,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_dropsrc.o \ coredll_droptgt.o \ coredll_oleutils.o \ + coredll_safearray.o \ coredll_msw_palette.o \ coredll_msw_pen.o \ coredll_msw_popupwin.o \ @@ -9862,6 +9945,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_msw_region.o \ coredll_msw_renderer.o \ coredll_msw_settings.o \ + coredll_msw_textmeasure.o \ coredll_msw_tooltip.o \ coredll_msw_toplevel.o \ coredll_uiaction.o \ @@ -9915,6 +9999,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_dropsrc.o \ coredll_droptgt.o \ coredll_oleutils.o \ + coredll_safearray.o \ coredll_msw_palette.o \ coredll_msw_pen.o \ coredll_msw_popupwin.o \ @@ -9923,6 +10008,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_msw_region.o \ coredll_msw_renderer.o \ coredll_msw_settings.o \ + coredll_msw_textmeasure.o \ coredll_msw_tooltip.o \ coredll_msw_toplevel.o \ coredll_uiaction.o \ @@ -9941,6 +10027,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_uiactionx11.o \ coredll_utilsx11.o \ coredll_generic_icon.o \ + coredll_generic_textmeasure.o \ coredll_generic_timer.o \ coredll_x11_app.o \ coredll_x11_bitmap.o \ @@ -10058,7 +10145,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_generic_listctrl.o \ coredll_paletteg.o \ coredll_regiong.o \ - coredll_generic_statusbr.o + coredll_generic_statusbr.o \ + coredll_generic_textmeasure.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_generic_accel.o \ @@ -10453,6 +10541,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_mdig.o \ coredll_prntdlgg.o \ coredll_generic_statusbr.o \ + coredll_generic_textmeasure.o \ coredll_os2_accel.o \ coredll_os2_app.o \ coredll_os2_bitmap.o \ @@ -10606,6 +10695,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_generic_icon.o \ coredll_generic_imaglist.o \ coredll_mask.o \ + coredll_generic_textmeasure.o \ coredll_dfb_app.o \ coredll_dfb_bitmap.o \ coredll_dfb_brush.o \ @@ -10639,6 +10729,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 = \ coredll_utilsx11.o \ coredll_generic_icon.o \ coredll_paletteg.o \ + coredll_generic_textmeasure.o \ coredll_gtk1_app.o \ coredll_gtk1_bitmap.o \ coredll_gtk1_brush.o \ @@ -10696,6 +10787,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_gtk_region.o \ coredll_gtk_renderer.o \ coredll_gtk_settings.o \ + coredll_gtk_textmeasure.o \ coredll_gtk_timer.o \ coredll_gtk_tooltip.o \ coredll_gtk_toplevel.o \ @@ -10733,6 +10825,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_gtk_region.o \ coredll_gtk_renderer.o \ coredll_gtk_settings.o \ + coredll_gtk_textmeasure.o \ coredll_gtk_timer.o \ coredll_gtk_tooltip.o \ coredll_gtk_toplevel.o \ @@ -10749,6 +10842,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_unix_fontutil.o \ coredll_uiactionx11.o \ coredll_utilsx11.o \ + coredll_generic_textmeasure.o \ coredll_x11_bitmap.o \ coredll_x11_brush.o \ coredll_x11_palette.o \ @@ -10790,6 +10884,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_dropsrc.o \ coredll_droptgt.o \ coredll_oleutils.o \ + coredll_safearray.o \ coredll_msw_palette.o \ coredll_msw_pen.o \ coredll_msw_popupwin.o \ @@ -10798,6 +10893,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_msw_region.o \ coredll_msw_renderer.o \ coredll_msw_settings.o \ + coredll_msw_textmeasure.o \ coredll_msw_tooltip.o \ coredll_msw_toplevel.o \ coredll_uiaction.o \ @@ -10851,6 +10947,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_dropsrc.o \ coredll_droptgt.o \ coredll_oleutils.o \ + coredll_safearray.o \ coredll_msw_palette.o \ coredll_msw_pen.o \ coredll_msw_popupwin.o \ @@ -10859,6 +10956,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_msw_region.o \ coredll_msw_renderer.o \ coredll_msw_settings.o \ + coredll_msw_textmeasure.o \ coredll_msw_tooltip.o \ coredll_msw_toplevel.o \ coredll_uiaction.o \ @@ -10877,6 +10975,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_uiactionx11.o \ coredll_utilsx11.o \ coredll_generic_icon.o \ + coredll_generic_textmeasure.o \ coredll_generic_timer.o \ coredll_x11_app.o \ coredll_x11_bitmap.o \ @@ -11043,6 +11142,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_tbarbase.o \ corelib_textcmn.o \ corelib_textentrycmn.o \ + corelib_textmeasurecmn.o \ corelib_toplvcmn.o \ corelib_treebase.o \ corelib_uiactioncmn.o \ @@ -11087,7 +11187,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_treectlg.o \ corelib_treebkg.o \ corelib_vlbox.o \ - corelib_vscroll.o + corelib_vscroll.o \ + corelib_xmlreshandler.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_7) \ @@ -11260,6 +11361,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_tbarbase.o \ corelib_textcmn.o \ corelib_textentrycmn.o \ + corelib_textmeasurecmn.o \ corelib_toplvcmn.o \ corelib_treebase.o \ corelib_uiactioncmn.o \ @@ -11304,7 +11406,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_treectlg.o \ corelib_treebkg.o \ corelib_vlbox.o \ - corelib_vscroll.o + corelib_vscroll.o \ + corelib_xmlreshandler.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ @COND_TOOLKIT_COCOA@ corelib_hid.o corelib_utilsexc_cf.o @@ -11315,6 +11418,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_generic_icon.o \ corelib_generic_imaglist.o \ corelib_mask.o \ + corelib_generic_textmeasure.o \ corelib_dfb_app.o \ corelib_dfb_bitmap.o \ corelib_dfb_brush.o \ @@ -11348,6 +11452,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 = \ corelib_utilsx11.o \ corelib_generic_icon.o \ corelib_paletteg.o \ + corelib_generic_textmeasure.o \ corelib_gtk1_app.o \ corelib_gtk1_bitmap.o \ corelib_gtk1_brush.o \ @@ -11405,6 +11510,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_gtk_region.o \ corelib_gtk_renderer.o \ corelib_gtk_settings.o \ + corelib_gtk_textmeasure.o \ corelib_gtk_timer.o \ corelib_gtk_tooltip.o \ corelib_gtk_toplevel.o \ @@ -11442,6 +11548,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_gtk_region.o \ corelib_gtk_renderer.o \ corelib_gtk_settings.o \ + corelib_gtk_textmeasure.o \ corelib_gtk_timer.o \ corelib_gtk_tooltip.o \ corelib_gtk_toplevel.o \ @@ -11458,6 +11565,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_unix_fontutil.o \ corelib_uiactionx11.o \ corelib_utilsx11.o \ + corelib_generic_textmeasure.o \ corelib_x11_bitmap.o \ corelib_x11_brush.o \ corelib_x11_palette.o \ @@ -11499,6 +11607,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_dropsrc.o \ corelib_droptgt.o \ corelib_oleutils.o \ + corelib_safearray.o \ corelib_msw_palette.o \ corelib_msw_pen.o \ corelib_msw_popupwin.o \ @@ -11507,6 +11616,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_msw_region.o \ corelib_msw_renderer.o \ corelib_msw_settings.o \ + corelib_msw_textmeasure.o \ corelib_msw_tooltip.o \ corelib_msw_toplevel.o \ corelib_uiaction.o \ @@ -11560,6 +11670,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_dropsrc.o \ corelib_droptgt.o \ corelib_oleutils.o \ + corelib_safearray.o \ corelib_msw_palette.o \ corelib_msw_pen.o \ corelib_msw_popupwin.o \ @@ -11568,6 +11679,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_msw_region.o \ corelib_msw_renderer.o \ corelib_msw_settings.o \ + corelib_msw_textmeasure.o \ corelib_msw_tooltip.o \ corelib_msw_toplevel.o \ corelib_uiaction.o \ @@ -11586,6 +11698,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_uiactionx11.o \ corelib_utilsx11.o \ corelib_generic_icon.o \ + corelib_generic_textmeasure.o \ corelib_generic_timer.o \ corelib_x11_app.o \ corelib_x11_bitmap.o \ @@ -11703,7 +11816,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_generic_listctrl.o \ corelib_paletteg.o \ corelib_regiong.o \ - corelib_generic_statusbr.o + corelib_generic_statusbr.o \ + corelib_generic_textmeasure.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_generic_accel.o \ @@ -12098,6 +12212,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_mdig.o \ corelib_prntdlgg.o \ corelib_generic_statusbr.o \ + corelib_generic_textmeasure.o \ corelib_os2_accel.o \ corelib_os2_app.o \ corelib_os2_bitmap.o \ @@ -12251,6 +12366,7 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_generic_icon.o \ corelib_generic_imaglist.o \ corelib_mask.o \ + corelib_generic_textmeasure.o \ corelib_dfb_app.o \ corelib_dfb_bitmap.o \ corelib_dfb_brush.o \ @@ -12284,6 +12400,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 = \ corelib_utilsx11.o \ corelib_generic_icon.o \ corelib_paletteg.o \ + corelib_generic_textmeasure.o \ corelib_gtk1_app.o \ corelib_gtk1_bitmap.o \ corelib_gtk1_brush.o \ @@ -12341,6 +12458,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_gtk_region.o \ corelib_gtk_renderer.o \ corelib_gtk_settings.o \ + corelib_gtk_textmeasure.o \ corelib_gtk_timer.o \ corelib_gtk_tooltip.o \ corelib_gtk_toplevel.o \ @@ -12378,6 +12496,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_gtk_region.o \ corelib_gtk_renderer.o \ corelib_gtk_settings.o \ + corelib_gtk_textmeasure.o \ corelib_gtk_timer.o \ corelib_gtk_tooltip.o \ corelib_gtk_toplevel.o \ @@ -12394,6 +12513,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_unix_fontutil.o \ corelib_uiactionx11.o \ corelib_utilsx11.o \ + corelib_generic_textmeasure.o \ corelib_x11_bitmap.o \ corelib_x11_brush.o \ corelib_x11_palette.o \ @@ -12435,6 +12555,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_dropsrc.o \ corelib_droptgt.o \ corelib_oleutils.o \ + corelib_safearray.o \ corelib_msw_palette.o \ corelib_msw_pen.o \ corelib_msw_popupwin.o \ @@ -12443,6 +12564,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_msw_region.o \ corelib_msw_renderer.o \ corelib_msw_settings.o \ + corelib_msw_textmeasure.o \ corelib_msw_tooltip.o \ corelib_msw_toplevel.o \ corelib_uiaction.o \ @@ -12496,6 +12618,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_dropsrc.o \ corelib_droptgt.o \ corelib_oleutils.o \ + corelib_safearray.o \ corelib_msw_palette.o \ corelib_msw_pen.o \ corelib_msw_popupwin.o \ @@ -12504,6 +12627,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_msw_region.o \ corelib_msw_renderer.o \ corelib_msw_settings.o \ + corelib_msw_textmeasure.o \ corelib_msw_tooltip.o \ corelib_msw_toplevel.o \ corelib_uiaction.o \ @@ -12522,6 +12646,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_uiactionx11.o \ corelib_utilsx11.o \ corelib_generic_icon.o \ + corelib_generic_textmeasure.o \ corelib_generic_timer.o \ corelib_x11_app.o \ corelib_x11_bitmap.o \ @@ -14413,7 +14538,8 @@ COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS = \ monodll_fontpickerg.o \ monodll_generic_listctrl.o \ monodll_prntdlgg.o \ - monodll_generic_statusbr.o + monodll_generic_statusbr.o \ + monodll_generic_textmeasure.o @COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS) COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS = \ monodll_generic_caret.o \ @@ -14542,7 +14668,8 @@ COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_12 = \ monolib_fontpickerg.o \ monolib_generic_listctrl.o \ monolib_prntdlgg.o \ - monolib_generic_statusbr.o + monolib_generic_statusbr.o \ + monolib_generic_textmeasure.o @COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_12 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_12) COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_17 = \ monolib_generic_caret.o \ @@ -14671,7 +14798,8 @@ COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_14 = \ coredll_fontpickerg.o \ coredll_generic_listctrl.o \ coredll_prntdlgg.o \ - coredll_generic_statusbr.o + coredll_generic_statusbr.o \ + coredll_generic_textmeasure.o @COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_14 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_14) COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_1 = \ coredll_generic_caret.o \ @@ -14788,7 +14916,8 @@ COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_1_0 = \ corelib_fontpickerg.o \ corelib_generic_listctrl.o \ corelib_prntdlgg.o \ - corelib_generic_statusbr.o + corelib_generic_statusbr.o \ + corelib_generic_textmeasure.o @COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_1_0 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_1_0) COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \ corelib_generic_caret.o \ @@ -16100,12 +16229,6 @@ wxjpeg_jdmerge.o: $(srcdir)/src/jpeg/jdmerge.c wxtiff_tif_win32.o: $(srcdir)/src/tiff/libtiff/tif_win32.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_win32.c -wxtiff_tif_apple.o: $(srcdir)/src/tiff/libtiff/tif_apple.c - $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_apple.c - -wxtiff_tif_msdos.o: $(srcdir)/src/tiff/libtiff/tif_msdos.c - $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_msdos.c - wxtiff_tif_aux.o: $(srcdir)/src/tiff/libtiff/tif_aux.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_aux.c @@ -16154,12 +16277,21 @@ wxtiff_tif_flush.o: $(srcdir)/src/tiff/libtiff/tif_flush.c wxtiff_tif_getimage.o: $(srcdir)/src/tiff/libtiff/tif_getimage.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_getimage.c +wxtiff_tif_jbig.o: $(srcdir)/src/tiff/libtiff/tif_jbig.c + $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_jbig.c + wxtiff_tif_jpeg.o: $(srcdir)/src/tiff/libtiff/tif_jpeg.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_jpeg.c +wxtiff_tif_jpeg_12.o: $(srcdir)/src/tiff/libtiff/tif_jpeg_12.c + $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_jpeg_12.c + wxtiff_tif_luv.o: $(srcdir)/src/tiff/libtiff/tif_luv.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_luv.c +wxtiff_tif_lzma.o: $(srcdir)/src/tiff/libtiff/tif_lzma.c + $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_lzma.c + wxtiff_tif_lzw.o: $(srcdir)/src/tiff/libtiff/tif_lzw.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_lzw.c @@ -18458,6 +18590,9 @@ monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP) monodll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp +monodll_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp + monodll_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp @@ -18515,6 +18650,9 @@ monodll_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONODLL_ODEP) monodll_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp +monodll_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp + monodll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp @@ -18545,6 +18683,9 @@ monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONO monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp +monodll_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp + monodll_stc.o: $(srcdir)/src/stc/stc.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp @@ -19046,6 +19187,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_gtk_textmeasure.o: $(srcdir)/src/gtk/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textmeasure.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_textmeasure.o: $(srcdir)/src/gtk/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textmeasure.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp @@ -19091,6 +19238,33 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp @@ -19412,6 +19586,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp @@ -19460,6 +19640,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_textmeasure.o: $(srcdir)/src/msw/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textmeasure.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_textmeasure.o: $(srcdir)/src/msw/textmeasure.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textmeasure.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp @@ -21665,6 +21851,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp +@COND_USE_GUI_1@monodll_textmeasurecmn.o: $(srcdir)/src/common/textmeasurecmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textmeasurecmn.cpp + @COND_USE_GUI_1@monodll_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp @@ -21800,6 +21989,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp +@COND_USE_GUI_1@monodll_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp + @COND_USE_GUI_1@monodll_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp @@ -24155,6 +24347,9 @@ monolib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONOLIB_ODEP) monolib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp +monolib_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp + monolib_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp @@ -24212,6 +24407,9 @@ monolib_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONOLIB_ODEP) monolib_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp +monolib_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp + monolib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp @@ -24242,6 +24440,9 @@ monolib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONO monolib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp +monolib_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp + monolib_stc.o: $(srcdir)/src/stc/stc.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/stc.cpp @@ -24743,6 +24944,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_gtk_textmeasure.o: $(srcdir)/src/gtk/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textmeasure.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_textmeasure.o: $(srcdir)/src/gtk/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textmeasure.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp @@ -24788,6 +24995,33 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp @@ -25109,6 +25343,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp @@ -25157,6 +25397,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_textmeasure.o: $(srcdir)/src/msw/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textmeasure.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_textmeasure.o: $(srcdir)/src/msw/textmeasure.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textmeasure.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp @@ -27362,6 +27608,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp +@COND_USE_GUI_1@monolib_textmeasurecmn.o: $(srcdir)/src/common/textmeasurecmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textmeasurecmn.cpp + @COND_USE_GUI_1@monolib_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp @@ -27497,6 +27746,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp +@COND_USE_GUI_1@monolib_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp + @COND_USE_GUI_1@monolib_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp @@ -30605,6 +30857,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_gtk_textmeasure.o: $(srcdir)/src/gtk/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textmeasure.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_textmeasure.o: $(srcdir)/src/gtk/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textmeasure.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp @@ -30650,6 +30908,33 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp @@ -30971,6 +31256,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp @@ -31019,6 +31310,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_textmeasure.o: $(srcdir)/src/msw/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textmeasure.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_textmeasure.o: $(srcdir)/src/msw/textmeasure.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textmeasure.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp @@ -33224,6 +33521,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp +@COND_USE_GUI_1@coredll_textmeasurecmn.o: $(srcdir)/src/common/textmeasurecmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/textmeasurecmn.cpp + @COND_USE_GUI_1@coredll_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp @@ -33359,6 +33659,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp +@COND_USE_GUI_1@coredll_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp + corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -34850,6 +35153,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_gtk_textmeasure.o: $(srcdir)/src/gtk/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textmeasure.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_textmeasure.o: $(srcdir)/src/gtk/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textmeasure.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp @@ -34895,6 +35204,33 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + +@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp @@ -35216,6 +35552,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp @@ -35264,6 +35606,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_textmeasure.o: $(srcdir)/src/msw/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textmeasure.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_textmeasure.o: $(srcdir)/src/msw/textmeasure.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textmeasure.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp @@ -37469,6 +37817,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp +@COND_USE_GUI_1@corelib_textmeasurecmn.o: $(srcdir)/src/common/textmeasurecmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/textmeasurecmn.cpp + @COND_USE_GUI_1@corelib_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp @@ -37604,6 +37955,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp +@COND_USE_GUI_1@corelib_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp + advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_ADV @@ -39245,6 +39599,9 @@ auidll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUIDLL_ODEP) auidll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUIDLL_ODEP) $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp +auidll_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(AUIDLL_ODEP) + $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp + auidll_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(AUIDLL_ODEP) $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp @@ -39269,6 +39626,9 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP) auilib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUILIB_ODEP) $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp +auilib_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(AUILIB_ODEP) + $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp + auilib_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(AUILIB_ODEP) $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp @@ -39305,6 +39665,9 @@ ribbondll_panel.o: $(srcdir)/src/ribbon/panel.cpp $(RIBBONDLL_ODEP) ribbondll_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONDLL_ODEP) $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp +ribbondll_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(RIBBONDLL_ODEP) + $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp + ribbonlib_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONLIB_ODEP) $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp @@ -39335,6 +39698,9 @@ ribbonlib_panel.o: $(srcdir)/src/ribbon/panel.cpp $(RIBBONLIB_ODEP) ribbonlib_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONLIB_ODEP) $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp +ribbonlib_xh_ribbon.o: $(srcdir)/src/xrc/xh_ribbon.cpp $(RIBBONLIB_ODEP) + $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_ribbon.cpp + propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID @@ -39419,6 +39785,9 @@ richtextdll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $( richtextdll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTDLL_ODEP) $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp +richtextdll_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp + richtextlib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTLIB_ODEP) $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp @@ -39449,6 +39818,9 @@ richtextlib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $( richtextlib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTLIB_ODEP) $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp +richtextlib_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(RICHTEXTLIB_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp + stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC @@ -40490,43 +40862,43 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp -debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@ -debian-dist: debian-native-dist debian-msw-dirs MSW_DIST - mkdir $(DISTDIR)/debian - -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian - $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs - $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs - $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs - rm -f $(DISTDIR)/*.spec - - @# now prune away a lot of the crap included by using cp -R - @# in other dist targets. Ugly and hardly portable but it - @# will run on any Debian box and that's enough for now. - - find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \ - -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \ - -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \ - -o -name "*.pro" \ - -o -name "*.vpj" \ - -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \ - \) -print0 | xargs -0 rm -rf - - rm -rf $(DISTDIR)/wxPython/SWIG - rm -rf $(DISTDIR)/wxPython/distrib - rm -rf $(DISTDIR)/wxPython/distutils - rm -rf $(DISTDIR)/wxPython/samples - rm -rf $(DISTDIR)/wxPython/contrib/iewin - find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf - - rm -rf $(DEBIAN_SOURCE_DIR) - mv $(DISTDIR) $(DEBIAN_SOURCE_DIR) - - -debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST - -debian-msw-dirs: - mkdir $(DISTDIR)/include/wx/msw - mkdir $(DISTDIR)/src/msw +@IF_GNU_MAKE@debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@ +@IF_GNU_MAKE@debian-dist: debian-native-dist debian-msw-dirs MSW_DIST +@IF_GNU_MAKE@ mkdir $(DISTDIR)/debian +@IF_GNU_MAKE@ -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian +@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs +@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs +@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs +@IF_GNU_MAKE@ rm -f $(DISTDIR)/*.spec +@IF_GNU_MAKE@ +@IF_GNU_MAKE@ @# now prune away a lot of the crap included by using cp -R +@IF_GNU_MAKE@ @# in other dist targets. Ugly and hardly portable but it +@IF_GNU_MAKE@ @# will run on any Debian box and that's enough for now. +@IF_GNU_MAKE@ +@IF_GNU_MAKE@ find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \ +@IF_GNU_MAKE@ -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \ +@IF_GNU_MAKE@ -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \ +@IF_GNU_MAKE@ -o -name "*.pro" \ +@IF_GNU_MAKE@ -o -name "*.vpj" \ +@IF_GNU_MAKE@ -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \ +@IF_GNU_MAKE@ \) -print0 | xargs -0 rm -rf +@IF_GNU_MAKE@ +@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/SWIG +@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/distrib +@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/distutils +@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/samples +@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/contrib/iewin +@IF_GNU_MAKE@ find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf +@IF_GNU_MAKE@ +@IF_GNU_MAKE@ rm -rf $(DEBIAN_SOURCE_DIR) +@IF_GNU_MAKE@ mv $(DISTDIR) $(DEBIAN_SOURCE_DIR) + + +@IF_GNU_MAKE@debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST + +@IF_GNU_MAKE@debian-msw-dirs: +@IF_GNU_MAKE@ mkdir $(DISTDIR)/include/wx/msw +@IF_GNU_MAKE@ mkdir $(DISTDIR)/src/msw RPMTOP=_dist_dir/_rpm_top