X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdaed652d7d2b20bc9f508d45f77a280f88279d9..1bf29304cc69cb68f2de9aa09e3a7f20353c03a1:/Makefile.in diff --git a/Makefile.in b/Makefile.in index e6ca34ef69..e10f0d209f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -104,7 +104,6 @@ WXPNG_CFLAGS = -DNDEBUG $(__INC_ZLIB_p) $(____SHARED) $(CPPFLAGS) $(CFLAGS) WXPNG_OBJECTS = \ wxpng_png.o \ wxpng_pngerror.o \ - wxpng_pnggccrd.o \ wxpng_pngget.o \ wxpng_pngmem.o \ wxpng_pngpread.o \ @@ -114,7 +113,6 @@ WXPNG_OBJECTS = \ wxpng_pngrutil.o \ wxpng_pngset.o \ wxpng_pngtrans.o \ - wxpng_pngvcrd.o \ wxpng_pngwio.o \ wxpng_pngwrite.o \ wxpng_pngwtran.o \ @@ -214,7 +212,7 @@ WXEXPAT_OBJECTS = \ WXSCINTILLA_CXXFLAGS = -DNDEBUG -I$(top_srcdir)/src/stc/scintilla/include \ -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ $(__wxscintilla_usingdll_p) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(____SHARED) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUG_DEFINE_p) $(____SHARED) $(CPPFLAGS) $(CXXFLAGS) WXSCINTILLA_OBJECTS = \ wxscintilla_AutoComplete.o \ wxscintilla_CallTip.o \ @@ -414,6 +412,7 @@ ALL_BASE_HEADERS = \ wx/ptr_shrd.h \ wx/recguard.h \ wx/regex.h \ + wx/rtti.h \ wx/scopedarray.h \ wx/scopedptr.h \ wx/scopeguard.h \ @@ -453,6 +452,7 @@ ALL_BASE_HEADERS = \ wx/variant.h \ wx/vector.h \ wx/version.h \ + wx/versioninfo.h \ wx/volume.h \ wx/weakref.h \ wx/wfstream.h \ @@ -465,10 +465,15 @@ ALL_BASE_HEADERS = \ wx/xlocale.h \ wx/xti.h \ wx/xtistrm.h \ + wx/xtictor.h \ + wx/xtihandler.h \ + wx/xtiprop.h \ + wx/xtitypes.h \ wx/zipstrm.h \ wx/zstream.h \ wx/meta/convertible.h \ wx/meta/if.h \ + wx/meta/implicitconversion.h \ wx/meta/int2type.h \ wx/meta/movable.h \ wx/meta/pod.h \ @@ -583,6 +588,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/ptr_shrd.h \ wx/recguard.h \ wx/regex.h \ + wx/rtti.h \ wx/scopedarray.h \ wx/scopedptr.h \ wx/scopeguard.h \ @@ -622,6 +628,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/variant.h \ wx/vector.h \ wx/version.h \ + wx/versioninfo.h \ wx/volume.h \ wx/weakref.h \ wx/wfstream.h \ @@ -634,10 +641,15 @@ ALL_PORTS_BASE_HEADERS = \ wx/xlocale.h \ wx/xti.h \ wx/xtistrm.h \ + wx/xtictor.h \ + wx/xtihandler.h \ + wx/xtiprop.h \ + wx/xtitypes.h \ wx/zipstrm.h \ wx/zstream.h \ wx/meta/convertible.h \ wx/meta/if.h \ + wx/meta/implicitconversion.h \ wx/meta/int2type.h \ wx/meta/movable.h \ wx/meta/pod.h \ @@ -1651,6 +1663,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_choic.o \ xrcdll_xh_choicbk.o \ xrcdll_xh_clrpicker.o \ + xrcdll_xh_cmdlinkbn.o \ xrcdll_xh_collpane.o \ xrcdll_xh_combo.o \ xrcdll_xh_comboctrl.o \ @@ -1694,6 +1707,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_text.o \ xrcdll_xh_tglbtn.o \ xrcdll_xh_toolb.o \ + xrcdll_xh_toolbk.o \ xrcdll_xh_tree.o \ xrcdll_xh_treebk.o \ xrcdll_xh_unkwn.o \ @@ -1719,6 +1733,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_choic.o \ xrclib_xh_choicbk.o \ xrclib_xh_clrpicker.o \ + xrclib_xh_cmdlinkbn.o \ xrclib_xh_collpane.o \ xrclib_xh_combo.o \ xrclib_xh_comboctrl.o \ @@ -1762,6 +1777,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_text.o \ xrclib_xh_tglbtn.o \ xrclib_xh_toolb.o \ + xrclib_xh_toolbk.o \ xrclib_xh_tree.o \ xrclib_xh_treebk.o \ xrclib_xh_unkwn.o \ @@ -3582,7 +3598,6 @@ COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR = \ wx/generic/animate.h @COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR) COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR = \ - wx/msw/commandlinkbutton.h \ wx/msw/hyperlink.h \ wx/msw/notifmsg.h \ wx/msw/sound.h \ @@ -3616,13 +3631,9 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_OSX_IPHONE@ wx/generic/animate.h wx/osx/sound.h @COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_PM@ wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h -COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR = \ - wx/msw/commandlinkbutton.h \ - wx/msw/hyperlink.h \ - wx/msw/notifmsg.h \ - wx/msw/sound.h \ - wx/msw/taskbar.h -@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR) +@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \ +@COND_TOOLKIT_WINCE@ wx/msw/hyperlink.h wx/msw/notifmsg.h wx/msw/sound.h \ +@COND_TOOLKIT_WINCE@ wx/msw/taskbar.h @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \ @@ -3634,12 +3645,20 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \ wx/gtk/dvrenderers.h \ wx/gtk/hyperlink.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR) -@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = \ -@COND_TOOLKIT_MSW@ wx/generic/animate.h wx/msw/bmpcbox.h wx/msw/calctrl.h \ -@COND_TOOLKIT_MSW@ wx/msw/datectrl.h -@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = \ -@COND_TOOLKIT_WINCE@ wx/generic/animate.h wx/msw/bmpcbox.h wx/msw/calctrl.h \ -@COND_TOOLKIT_WINCE@ wx/msw/datectrl.h +COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR = \ + wx/generic/animate.h \ + wx/msw/bmpcbox.h \ + wx/msw/commandlinkbutton.h \ + wx/msw/calctrl.h \ + wx/msw/datectrl.h +@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR) +COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR = \ + wx/generic/animate.h \ + wx/msw/bmpcbox.h \ + wx/msw/commandlinkbutton.h \ + wx/msw/calctrl.h \ + wx/msw/datectrl.h +@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR) COND_WXUNIV_0_ADVANCED_HDR = \ wx/aboutdlg.h \ wx/animate.h \ @@ -3814,6 +3833,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/collpane.h \ wx/combo.h \ wx/combobox.h \ + wx/compositewin.h \ wx/control.h \ wx/ctrlsub.h \ wx/cursor.h \ @@ -3923,6 +3943,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/cmdproc.h \ wx/colordlg.h \ wx/colour.h \ + wx/colourdata.h \ wx/cshelp.h \ wx/dataobj.h \ wx/dcmirror.h \ @@ -3943,6 +3964,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/fontpicker.h \ wx/fmappriv.h \ wx/font.h \ + wx/fontdata.h \ wx/fontdlg.h \ wx/fontenum.h \ wx/fontutil.h \ @@ -4052,6 +4074,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/xrc/xh_choic.h \ wx/xrc/xh_choicbk.h \ wx/xrc/xh_clrpicker.h \ + wx/xrc/xh_cmdlinkbn.h \ wx/xrc/xh_collpane.h \ wx/xrc/xh_combo.h \ wx/xrc/xh_comboctrl.h \ @@ -4095,6 +4118,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/xrc/xh_text.h \ wx/xrc/xh_tglbtn.h \ wx/xrc/xh_toolb.h \ + wx/xrc/xh_toolbk.h \ wx/xrc/xh_tree.h \ wx/xrc/xh_treebk.h \ wx/xrc/xh_unkwn.h \ @@ -4346,6 +4370,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_choic.o \ monodll_xh_choicbk.o \ monodll_xh_clrpicker.o \ + monodll_xh_cmdlinkbn.o \ monodll_xh_collpane.o \ monodll_xh_combo.o \ monodll_xh_comboctrl.o \ @@ -4389,6 +4414,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_text.o \ monodll_xh_tglbtn.o \ monodll_xh_toolb.o \ + monodll_xh_toolbk.o \ monodll_xh_tree.o \ monodll_xh_treebk.o \ monodll_xh_unkwn.o \ @@ -4444,14 +4470,19 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_appcmn.o \ monodll_artprov.o \ monodll_artstd.o \ + monodll_arttango.o \ monodll_bmpbase.o \ + monodll_bmpbtncmn.o \ monodll_bookctrl.o \ monodll_btncmn.o \ monodll_cairo.o \ + monodll_checkboxcmn.o \ + monodll_checklstcmn.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_clrpickercmn.o \ monodll_colourcmn.o \ + monodll_colourdata.o \ monodll_combocmn.o \ monodll_cmdproc.o \ monodll_cmndata.o \ @@ -4459,11 +4490,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_cshelp.o \ monodll_ctrlcmn.o \ monodll_ctrlsub.o \ - monodll_datacmn.o \ monodll_dcbase.o \ monodll_dcbufcmn.o \ monodll_dcgraph.o \ monodll_dcsvg.o \ + monodll_dirctrlcmn.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ monodll_dobjcmn.o \ @@ -4479,6 +4510,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_fontpickercmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ + monodll_fontdata.o \ monodll_graphicc.o \ monodll_fontenumcmn.o \ monodll_fontmap.o \ @@ -4517,20 +4549,28 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_overlaycmn.o \ monodll_ownerdrwcmn.o \ monodll_paper.o \ + monodll_panelcmn.o \ monodll_persist.o \ monodll_pickerbase.o \ monodll_popupcmn.o \ monodll_prntbase.o \ monodll_quantize.o \ + monodll_radiobtncmn.o \ monodll_radiocmn.o \ monodll_rearrangectrl.o \ monodll_rendcmn.o \ monodll_rgncmn.o \ + monodll_scrolbarcmn.o \ monodll_settcmn.o \ monodll_sizer.o \ + monodll_slidercmn.o \ + monodll_spinbtncmn.o \ monodll_spinctrlcmn.o \ monodll_srchcmn.o \ monodll_statbar.o \ + monodll_statbmpcmn.o \ + monodll_statboxcmn.o \ + monodll_statlinecmn.o \ monodll_stattextcmn.o \ monodll_stockitem.o \ monodll_tbarbase.o \ @@ -4643,14 +4683,19 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_appcmn.o \ monodll_artprov.o \ monodll_artstd.o \ + monodll_arttango.o \ monodll_bmpbase.o \ + monodll_bmpbtncmn.o \ monodll_bookctrl.o \ monodll_btncmn.o \ monodll_cairo.o \ + monodll_checkboxcmn.o \ + monodll_checklstcmn.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_clrpickercmn.o \ monodll_colourcmn.o \ + monodll_colourdata.o \ monodll_combocmn.o \ monodll_cmdproc.o \ monodll_cmndata.o \ @@ -4658,11 +4703,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_cshelp.o \ monodll_ctrlcmn.o \ monodll_ctrlsub.o \ - monodll_datacmn.o \ monodll_dcbase.o \ monodll_dcbufcmn.o \ monodll_dcgraph.o \ monodll_dcsvg.o \ + monodll_dirctrlcmn.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ monodll_dobjcmn.o \ @@ -4678,6 +4723,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_fontpickercmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ + monodll_fontdata.o \ monodll_graphicc.o \ monodll_fontenumcmn.o \ monodll_fontmap.o \ @@ -4716,20 +4762,28 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_overlaycmn.o \ monodll_ownerdrwcmn.o \ monodll_paper.o \ + monodll_panelcmn.o \ monodll_persist.o \ monodll_pickerbase.o \ monodll_popupcmn.o \ monodll_prntbase.o \ monodll_quantize.o \ + monodll_radiobtncmn.o \ monodll_radiocmn.o \ monodll_rearrangectrl.o \ monodll_rendcmn.o \ monodll_rgncmn.o \ + monodll_scrolbarcmn.o \ monodll_settcmn.o \ monodll_sizer.o \ + monodll_slidercmn.o \ + monodll_spinbtncmn.o \ monodll_spinctrlcmn.o \ monodll_srchcmn.o \ monodll_statbar.o \ + monodll_statbmpcmn.o \ + monodll_statboxcmn.o \ + monodll_statlinecmn.o \ monodll_stattextcmn.o \ monodll_stockitem.o \ monodll_tbarbase.o \ @@ -5206,6 +5260,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_gtk1_listbox.o \ monodll_gtk1_mdi.o \ monodll_gtk1_menu.o \ + monodll_gtk1_mnemonics.o \ monodll_gtk1_notebook.o \ monodll_gtk1_radiobox.o \ monodll_gtk1_radiobut.o \ @@ -5255,7 +5310,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_gtk_listbox.o \ monodll_gtk_mdi.o \ monodll_gtk_menu.o \ - monodll_mnemonics.o \ + monodll_gtk_mnemonics.o \ monodll_gtk_msgdlg.o \ monodll_gtk_nativewin.o \ monodll_gtk_notebook.o \ @@ -5485,7 +5540,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS = \ monodll_iphone_dialog.o \ monodll_iphone_evtloop.o \ monodll_iphone_gauge.o \ - monodll_glcanvas.o \ monodll_iphone_msgdlg.o \ monodll_iphone_nonownedwnd.o \ monodll_iphone_scrolbar.o \ @@ -5963,7 +6017,9 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \ monodll_bmpcboxcmn.o \ monodll_calctrlcmn.o \ monodll_datavcmn.o \ + monodll_gridcmn.o \ monodll_hyperlnkcmn.o \ + monodll_odcombocmn.o \ monodll_aboutdlgg.o \ monodll_bmpcboxg.o \ monodll_calctrlg.o \ @@ -5993,7 +6049,9 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \ monodll_bmpcboxcmn.o \ monodll_calctrlcmn.o \ monodll_datavcmn.o \ + monodll_gridcmn.o \ monodll_hyperlnkcmn.o \ + monodll_odcombocmn.o \ monodll_aboutdlgg.o \ monodll_bmpcboxg.o \ monodll_calctrlg.o \ @@ -6030,6 +6088,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \ monodll_animateg.o \ monodll_msw_bmpcbox.o \ monodll_msw_calctrl.o \ + monodll_commandlinkbutton.o \ monodll_datecontrols.o \ monodll_datectrl.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS) @@ -6037,6 +6096,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \ monodll_animateg.o \ monodll_msw_bmpcbox.o \ monodll_msw_calctrl.o \ + monodll_commandlinkbutton.o \ monodll_datecontrols.o \ monodll_datectrl.o @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS) @@ -6220,6 +6280,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_choic.o \ monolib_xh_choicbk.o \ monolib_xh_clrpicker.o \ + monolib_xh_cmdlinkbn.o \ monolib_xh_collpane.o \ monolib_xh_combo.o \ monolib_xh_comboctrl.o \ @@ -6263,6 +6324,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_text.o \ monolib_xh_tglbtn.o \ monolib_xh_toolb.o \ + monolib_xh_toolbk.o \ monolib_xh_tree.o \ monolib_xh_treebk.o \ monolib_xh_unkwn.o \ @@ -6318,14 +6380,19 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_appcmn.o \ monolib_artprov.o \ monolib_artstd.o \ + monolib_arttango.o \ monolib_bmpbase.o \ + monolib_bmpbtncmn.o \ monolib_bookctrl.o \ monolib_btncmn.o \ monolib_cairo.o \ + monolib_checkboxcmn.o \ + monolib_checklstcmn.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_clrpickercmn.o \ monolib_colourcmn.o \ + monolib_colourdata.o \ monolib_combocmn.o \ monolib_cmdproc.o \ monolib_cmndata.o \ @@ -6333,11 +6400,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_cshelp.o \ monolib_ctrlcmn.o \ monolib_ctrlsub.o \ - monolib_datacmn.o \ monolib_dcbase.o \ monolib_dcbufcmn.o \ monolib_dcgraph.o \ monolib_dcsvg.o \ + monolib_dirctrlcmn.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ monolib_dobjcmn.o \ @@ -6353,6 +6420,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_fontpickercmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ + monolib_fontdata.o \ monolib_graphicc.o \ monolib_fontenumcmn.o \ monolib_fontmap.o \ @@ -6391,20 +6459,28 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_overlaycmn.o \ monolib_ownerdrwcmn.o \ monolib_paper.o \ + monolib_panelcmn.o \ monolib_persist.o \ monolib_pickerbase.o \ monolib_popupcmn.o \ monolib_prntbase.o \ monolib_quantize.o \ + monolib_radiobtncmn.o \ monolib_radiocmn.o \ monolib_rearrangectrl.o \ monolib_rendcmn.o \ monolib_rgncmn.o \ + monolib_scrolbarcmn.o \ monolib_settcmn.o \ monolib_sizer.o \ + monolib_slidercmn.o \ + monolib_spinbtncmn.o \ monolib_spinctrlcmn.o \ monolib_srchcmn.o \ monolib_statbar.o \ + monolib_statbmpcmn.o \ + monolib_statboxcmn.o \ + monolib_statlinecmn.o \ monolib_stattextcmn.o \ monolib_stockitem.o \ monolib_tbarbase.o \ @@ -6517,14 +6593,19 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_appcmn.o \ monolib_artprov.o \ monolib_artstd.o \ + monolib_arttango.o \ monolib_bmpbase.o \ + monolib_bmpbtncmn.o \ monolib_bookctrl.o \ monolib_btncmn.o \ monolib_cairo.o \ + monolib_checkboxcmn.o \ + monolib_checklstcmn.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_clrpickercmn.o \ monolib_colourcmn.o \ + monolib_colourdata.o \ monolib_combocmn.o \ monolib_cmdproc.o \ monolib_cmndata.o \ @@ -6532,11 +6613,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_cshelp.o \ monolib_ctrlcmn.o \ monolib_ctrlsub.o \ - monolib_datacmn.o \ monolib_dcbase.o \ monolib_dcbufcmn.o \ monolib_dcgraph.o \ monolib_dcsvg.o \ + monolib_dirctrlcmn.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ monolib_dobjcmn.o \ @@ -6552,6 +6633,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_fontpickercmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ + monolib_fontdata.o \ monolib_graphicc.o \ monolib_fontenumcmn.o \ monolib_fontmap.o \ @@ -6590,20 +6672,28 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_overlaycmn.o \ monolib_ownerdrwcmn.o \ monolib_paper.o \ + monolib_panelcmn.o \ monolib_persist.o \ monolib_pickerbase.o \ monolib_popupcmn.o \ monolib_prntbase.o \ monolib_quantize.o \ + monolib_radiobtncmn.o \ monolib_radiocmn.o \ monolib_rearrangectrl.o \ monolib_rendcmn.o \ monolib_rgncmn.o \ + monolib_scrolbarcmn.o \ monolib_settcmn.o \ monolib_sizer.o \ + monolib_slidercmn.o \ + monolib_spinbtncmn.o \ monolib_spinctrlcmn.o \ monolib_srchcmn.o \ monolib_statbar.o \ + monolib_statbmpcmn.o \ + monolib_statboxcmn.o \ + monolib_statlinecmn.o \ monolib_stattextcmn.o \ monolib_stockitem.o \ monolib_tbarbase.o \ @@ -7080,6 +7170,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_gtk1_listbox.o \ monolib_gtk1_mdi.o \ monolib_gtk1_menu.o \ + monolib_gtk1_mnemonics.o \ monolib_gtk1_notebook.o \ monolib_gtk1_radiobox.o \ monolib_gtk1_radiobut.o \ @@ -7129,7 +7220,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_gtk_listbox.o \ monolib_gtk_mdi.o \ monolib_gtk_menu.o \ - monolib_mnemonics.o \ + monolib_gtk_mnemonics.o \ monolib_gtk_msgdlg.o \ monolib_gtk_nativewin.o \ monolib_gtk_notebook.o \ @@ -7359,7 +7450,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 = \ monolib_iphone_dialog.o \ monolib_iphone_evtloop.o \ monolib_iphone_gauge.o \ - monolib_glcanvas.o \ monolib_iphone_msgdlg.o \ monolib_iphone_nonownedwnd.o \ monolib_iphone_scrolbar.o \ @@ -7837,7 +7927,9 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \ monolib_bmpcboxcmn.o \ monolib_calctrlcmn.o \ monolib_datavcmn.o \ + monolib_gridcmn.o \ monolib_hyperlnkcmn.o \ + monolib_odcombocmn.o \ monolib_aboutdlgg.o \ monolib_bmpcboxg.o \ monolib_calctrlg.o \ @@ -7867,7 +7959,9 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \ monolib_bmpcboxcmn.o \ monolib_calctrlcmn.o \ monolib_datavcmn.o \ + monolib_gridcmn.o \ monolib_hyperlnkcmn.o \ + monolib_odcombocmn.o \ monolib_aboutdlgg.o \ monolib_bmpcboxg.o \ monolib_calctrlg.o \ @@ -7904,6 +7998,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \ monolib_animateg.o \ monolib_msw_bmpcbox.o \ monolib_msw_calctrl.o \ + monolib_commandlinkbutton.o \ monolib_datecontrols.o \ monolib_datectrl.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1) @@ -7911,6 +8006,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \ monolib_animateg.o \ monolib_msw_bmpcbox.o \ monolib_msw_calctrl.o \ + monolib_commandlinkbutton.o \ monolib_datecontrols.o \ monolib_datectrl.o @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1) @@ -8378,14 +8474,19 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_appcmn.o \ coredll_artprov.o \ coredll_artstd.o \ + coredll_arttango.o \ coredll_bmpbase.o \ + coredll_bmpbtncmn.o \ coredll_bookctrl.o \ coredll_btncmn.o \ coredll_cairo.o \ + coredll_checkboxcmn.o \ + coredll_checklstcmn.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_clrpickercmn.o \ coredll_colourcmn.o \ + coredll_colourdata.o \ coredll_combocmn.o \ coredll_cmdproc.o \ coredll_cmndata.o \ @@ -8393,11 +8494,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_cshelp.o \ coredll_ctrlcmn.o \ coredll_ctrlsub.o \ - coredll_datacmn.o \ coredll_dcbase.o \ coredll_dcbufcmn.o \ coredll_dcgraph.o \ coredll_dcsvg.o \ + coredll_dirctrlcmn.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ coredll_dobjcmn.o \ @@ -8413,6 +8514,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_fontpickercmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ + coredll_fontdata.o \ coredll_graphicc.o \ coredll_fontenumcmn.o \ coredll_fontmap.o \ @@ -8451,20 +8553,28 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_overlaycmn.o \ coredll_ownerdrwcmn.o \ coredll_paper.o \ + coredll_panelcmn.o \ coredll_persist.o \ coredll_pickerbase.o \ coredll_popupcmn.o \ coredll_prntbase.o \ coredll_quantize.o \ + coredll_radiobtncmn.o \ coredll_radiocmn.o \ coredll_rearrangectrl.o \ coredll_rendcmn.o \ coredll_rgncmn.o \ + coredll_scrolbarcmn.o \ coredll_settcmn.o \ coredll_sizer.o \ + coredll_slidercmn.o \ + coredll_spinbtncmn.o \ coredll_spinctrlcmn.o \ coredll_srchcmn.o \ coredll_statbar.o \ + coredll_statbmpcmn.o \ + coredll_statboxcmn.o \ + coredll_statlinecmn.o \ coredll_stattextcmn.o \ coredll_stockitem.o \ coredll_tbarbase.o \ @@ -8577,14 +8687,19 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_appcmn.o \ coredll_artprov.o \ coredll_artstd.o \ + coredll_arttango.o \ coredll_bmpbase.o \ + coredll_bmpbtncmn.o \ coredll_bookctrl.o \ coredll_btncmn.o \ coredll_cairo.o \ + coredll_checkboxcmn.o \ + coredll_checklstcmn.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_clrpickercmn.o \ coredll_colourcmn.o \ + coredll_colourdata.o \ coredll_combocmn.o \ coredll_cmdproc.o \ coredll_cmndata.o \ @@ -8592,11 +8707,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_cshelp.o \ coredll_ctrlcmn.o \ coredll_ctrlsub.o \ - coredll_datacmn.o \ coredll_dcbase.o \ coredll_dcbufcmn.o \ coredll_dcgraph.o \ coredll_dcsvg.o \ + coredll_dirctrlcmn.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ coredll_dobjcmn.o \ @@ -8612,6 +8727,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_fontpickercmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ + coredll_fontdata.o \ coredll_graphicc.o \ coredll_fontenumcmn.o \ coredll_fontmap.o \ @@ -8650,20 +8766,28 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_overlaycmn.o \ coredll_ownerdrwcmn.o \ coredll_paper.o \ + coredll_panelcmn.o \ coredll_persist.o \ coredll_pickerbase.o \ coredll_popupcmn.o \ coredll_prntbase.o \ coredll_quantize.o \ + coredll_radiobtncmn.o \ coredll_radiocmn.o \ coredll_rearrangectrl.o \ coredll_rendcmn.o \ coredll_rgncmn.o \ + coredll_scrolbarcmn.o \ coredll_settcmn.o \ coredll_sizer.o \ + coredll_slidercmn.o \ + coredll_spinbtncmn.o \ coredll_spinctrlcmn.o \ coredll_srchcmn.o \ coredll_statbar.o \ + coredll_statbmpcmn.o \ + coredll_statboxcmn.o \ + coredll_statlinecmn.o \ coredll_stattextcmn.o \ coredll_stockitem.o \ coredll_tbarbase.o \ @@ -9140,6 +9264,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_gtk1_listbox.o \ coredll_gtk1_mdi.o \ coredll_gtk1_menu.o \ + coredll_gtk1_mnemonics.o \ coredll_gtk1_notebook.o \ coredll_gtk1_radiobox.o \ coredll_gtk1_radiobut.o \ @@ -9189,7 +9314,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_gtk_listbox.o \ coredll_gtk_mdi.o \ coredll_gtk_menu.o \ - coredll_mnemonics.o \ + coredll_gtk_mnemonics.o \ coredll_gtk_msgdlg.o \ coredll_gtk_nativewin.o \ coredll_gtk_notebook.o \ @@ -9419,7 +9544,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 = \ coredll_iphone_dialog.o \ coredll_iphone_evtloop.o \ coredll_iphone_gauge.o \ - coredll_glcanvas.o \ coredll_iphone_msgdlg.o \ coredll_iphone_nonownedwnd.o \ coredll_iphone_scrolbar.o \ @@ -9922,14 +10046,19 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_appcmn.o \ corelib_artprov.o \ corelib_artstd.o \ + corelib_arttango.o \ corelib_bmpbase.o \ + corelib_bmpbtncmn.o \ corelib_bookctrl.o \ corelib_btncmn.o \ corelib_cairo.o \ + corelib_checkboxcmn.o \ + corelib_checklstcmn.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_clrpickercmn.o \ corelib_colourcmn.o \ + corelib_colourdata.o \ corelib_combocmn.o \ corelib_cmdproc.o \ corelib_cmndata.o \ @@ -9937,11 +10066,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_cshelp.o \ corelib_ctrlcmn.o \ corelib_ctrlsub.o \ - corelib_datacmn.o \ corelib_dcbase.o \ corelib_dcbufcmn.o \ corelib_dcgraph.o \ corelib_dcsvg.o \ + corelib_dirctrlcmn.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ corelib_dobjcmn.o \ @@ -9957,6 +10086,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_fontpickercmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ + corelib_fontdata.o \ corelib_graphicc.o \ corelib_fontenumcmn.o \ corelib_fontmap.o \ @@ -9995,20 +10125,28 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_overlaycmn.o \ corelib_ownerdrwcmn.o \ corelib_paper.o \ + corelib_panelcmn.o \ corelib_persist.o \ corelib_pickerbase.o \ corelib_popupcmn.o \ corelib_prntbase.o \ corelib_quantize.o \ + corelib_radiobtncmn.o \ corelib_radiocmn.o \ corelib_rearrangectrl.o \ corelib_rendcmn.o \ corelib_rgncmn.o \ + corelib_scrolbarcmn.o \ corelib_settcmn.o \ corelib_sizer.o \ + corelib_slidercmn.o \ + corelib_spinbtncmn.o \ corelib_spinctrlcmn.o \ corelib_srchcmn.o \ corelib_statbar.o \ + corelib_statbmpcmn.o \ + corelib_statboxcmn.o \ + corelib_statlinecmn.o \ corelib_stattextcmn.o \ corelib_stockitem.o \ corelib_tbarbase.o \ @@ -10121,14 +10259,19 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_appcmn.o \ corelib_artprov.o \ corelib_artstd.o \ + corelib_arttango.o \ corelib_bmpbase.o \ + corelib_bmpbtncmn.o \ corelib_bookctrl.o \ corelib_btncmn.o \ corelib_cairo.o \ + corelib_checkboxcmn.o \ + corelib_checklstcmn.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_clrpickercmn.o \ corelib_colourcmn.o \ + corelib_colourdata.o \ corelib_combocmn.o \ corelib_cmdproc.o \ corelib_cmndata.o \ @@ -10136,11 +10279,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_cshelp.o \ corelib_ctrlcmn.o \ corelib_ctrlsub.o \ - corelib_datacmn.o \ corelib_dcbase.o \ corelib_dcbufcmn.o \ corelib_dcgraph.o \ corelib_dcsvg.o \ + corelib_dirctrlcmn.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ corelib_dobjcmn.o \ @@ -10156,6 +10299,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_fontpickercmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ + corelib_fontdata.o \ corelib_graphicc.o \ corelib_fontenumcmn.o \ corelib_fontmap.o \ @@ -10194,20 +10338,28 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_overlaycmn.o \ corelib_ownerdrwcmn.o \ corelib_paper.o \ + corelib_panelcmn.o \ corelib_persist.o \ corelib_pickerbase.o \ corelib_popupcmn.o \ corelib_prntbase.o \ corelib_quantize.o \ + corelib_radiobtncmn.o \ corelib_radiocmn.o \ corelib_rearrangectrl.o \ corelib_rendcmn.o \ corelib_rgncmn.o \ + corelib_scrolbarcmn.o \ corelib_settcmn.o \ corelib_sizer.o \ + corelib_slidercmn.o \ + corelib_spinbtncmn.o \ corelib_spinctrlcmn.o \ corelib_srchcmn.o \ corelib_statbar.o \ + corelib_statbmpcmn.o \ + corelib_statboxcmn.o \ + corelib_statlinecmn.o \ corelib_stattextcmn.o \ corelib_stockitem.o \ corelib_tbarbase.o \ @@ -10684,6 +10836,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_gtk1_listbox.o \ corelib_gtk1_mdi.o \ corelib_gtk1_menu.o \ + corelib_gtk1_mnemonics.o \ corelib_gtk1_notebook.o \ corelib_gtk1_radiobox.o \ corelib_gtk1_radiobut.o \ @@ -10733,7 +10886,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_gtk_listbox.o \ corelib_gtk_mdi.o \ corelib_gtk_menu.o \ - corelib_mnemonics.o \ + corelib_gtk_mnemonics.o \ corelib_gtk_msgdlg.o \ corelib_gtk_nativewin.o \ corelib_gtk_notebook.o \ @@ -10963,7 +11116,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 = \ corelib_iphone_dialog.o \ corelib_iphone_evtloop.o \ corelib_iphone_gauge.o \ - corelib_glcanvas.o \ corelib_iphone_msgdlg.o \ corelib_iphone_nonownedwnd.o \ corelib_iphone_scrolbar.o \ @@ -11510,7 +11662,9 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 = \ advdll_bmpcboxcmn.o \ advdll_calctrlcmn.o \ advdll_datavcmn.o \ + advdll_gridcmn.o \ advdll_hyperlnkcmn.o \ + advdll_odcombocmn.o \ advdll_aboutdlgg.o \ advdll_bmpcboxg.o \ advdll_calctrlg.o \ @@ -11540,7 +11694,9 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 = \ advdll_bmpcboxcmn.o \ advdll_calctrlcmn.o \ advdll_datavcmn.o \ + advdll_gridcmn.o \ advdll_hyperlnkcmn.o \ + advdll_odcombocmn.o \ advdll_aboutdlgg.o \ advdll_bmpcboxg.o \ advdll_calctrlg.o \ @@ -11577,6 +11733,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \ advdll_animateg.o \ advdll_msw_bmpcbox.o \ advdll_msw_calctrl.o \ + advdll_commandlinkbutton.o \ advdll_datecontrols.o \ advdll_datectrl.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2) @@ -11584,6 +11741,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \ advdll_animateg.o \ advdll_msw_bmpcbox.o \ advdll_msw_calctrl.o \ + advdll_commandlinkbutton.o \ advdll_datecontrols.o \ advdll_datectrl.o @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2) @@ -11606,7 +11764,9 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 = \ advlib_bmpcboxcmn.o \ advlib_calctrlcmn.o \ advlib_datavcmn.o \ + advlib_gridcmn.o \ advlib_hyperlnkcmn.o \ + advlib_odcombocmn.o \ advlib_aboutdlgg.o \ advlib_bmpcboxg.o \ advlib_calctrlg.o \ @@ -11636,7 +11796,9 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \ advlib_bmpcboxcmn.o \ advlib_calctrlcmn.o \ advlib_datavcmn.o \ + advlib_gridcmn.o \ advlib_hyperlnkcmn.o \ + advlib_odcombocmn.o \ advlib_aboutdlgg.o \ advlib_bmpcboxg.o \ advlib_calctrlg.o \ @@ -11673,6 +11835,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \ advlib_animateg.o \ advlib_msw_bmpcbox.o \ advlib_msw_calctrl.o \ + advlib_commandlinkbutton.o \ advlib_datecontrols.o \ advlib_datectrl.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3) @@ -11680,6 +11843,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \ advlib_animateg.o \ advlib_msw_bmpcbox.o \ advlib_msw_calctrl.o \ + advlib_commandlinkbutton.o \ advlib_datecontrols.o \ advlib_datectrl.o @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3) @@ -12634,6 +12798,8 @@ COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_cmd = rm -f \ @COND_TOOLKIT_OSX_CARBON@ = gldll_carbon_glcanvas.o gldll_glcanvas_osx.o @COND_TOOLKIT_OSX_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS \ @COND_TOOLKIT_OSX_COCOA@ = gldll_osx_cocoa_glcanvas.o gldll_glcanvas_osx.o +@COND_TOOLKIT_OSX_IPHONE@__OPENGL_SRC_PLATFORM_OBJECTS \ +@COND_TOOLKIT_OSX_IPHONE@ = gldll_iphone_glcanvas.o gldll_glcanvas_osx.o @COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_os2_glcanvas.o @COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_msw_glcanvas.o @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS = \ @@ -12672,6 +12838,8 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \ @COND_TOOLKIT_OSX_CARBON@ = gllib_carbon_glcanvas.o gllib_glcanvas_osx.o @COND_TOOLKIT_OSX_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 \ @COND_TOOLKIT_OSX_COCOA@ = gllib_osx_cocoa_glcanvas.o gllib_glcanvas_osx.o +@COND_TOOLKIT_OSX_IPHONE@__OPENGL_SRC_PLATFORM_OBJECTS_1 \ +@COND_TOOLKIT_OSX_IPHONE@ = gllib_iphone_glcanvas.o gllib_glcanvas_osx.o @COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_os2_glcanvas.o @COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_msw_glcanvas.o @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \ @@ -12829,7 +12997,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ monodll_msw_aboutdlg.o \ - monodll_commandlinkbutton.o \ monodll_msw_hyperlink.o \ monodll_msw_notifmsg.o \ monodll_msw_sound.o \ @@ -12869,7 +13036,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ monodll_msw_aboutdlg.o \ - monodll_commandlinkbutton.o \ monodll_msw_hyperlink.o \ monodll_msw_notifmsg.o \ monodll_msw_sound.o \ @@ -13018,7 +13184,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ monolib_taskbarcmn.o \ monolib_msw_aboutdlg.o \ - monolib_commandlinkbutton.o \ monolib_msw_hyperlink.o \ monolib_msw_notifmsg.o \ monolib_msw_sound.o \ @@ -13058,7 +13223,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ monolib_taskbarcmn.o \ monolib_msw_aboutdlg.o \ - monolib_commandlinkbutton.o \ monolib_msw_hyperlink.o \ monolib_msw_notifmsg.o \ monolib_msw_sound.o \ @@ -13304,7 +13468,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ advdll_taskbarcmn.o \ advdll_msw_aboutdlg.o \ - advdll_commandlinkbutton.o \ advdll_msw_hyperlink.o \ advdll_msw_notifmsg.o \ advdll_msw_sound.o \ @@ -13344,7 +13507,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ advdll_taskbarcmn.o \ advdll_msw_aboutdlg.o \ - advdll_commandlinkbutton.o \ advdll_msw_hyperlink.o \ advdll_msw_notifmsg.o \ advdll_msw_sound.o \ @@ -13396,7 +13558,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ advlib_taskbarcmn.o \ advlib_msw_aboutdlg.o \ - advlib_commandlinkbutton.o \ advlib_msw_hyperlink.o \ advlib_msw_notifmsg.o \ advlib_msw_sound.o \ @@ -13436,7 +13597,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ advlib_taskbarcmn.o \ advlib_msw_aboutdlg.o \ - advlib_commandlinkbutton.o \ advlib_msw_hyperlink.o \ advlib_msw_notifmsg.o \ advlib_msw_sound.o \ @@ -13457,7 +13617,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_63 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_61 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_62 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p_61 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p_61 = --define wxNO_THREADS @@ -14468,9 +14628,6 @@ wxpng_png.o: $(srcdir)/src/png/png.c wxpng_pngerror.o: $(srcdir)/src/png/pngerror.c $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngerror.c -wxpng_pnggccrd.o: $(srcdir)/src/png/pnggccrd.c - $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pnggccrd.c - wxpng_pngget.o: $(srcdir)/src/png/pngget.c $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngget.c @@ -14498,9 +14655,6 @@ wxpng_pngset.o: $(srcdir)/src/png/pngset.c wxpng_pngtrans.o: $(srcdir)/src/png/pngtrans.c $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngtrans.c -wxpng_pngvcrd.o: $(srcdir)/src/png/pngvcrd.c - $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngvcrd.c - wxpng_pngwio.o: $(srcdir)/src/png/pngwio.c $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngwio.c @@ -15611,7 +15765,7 @@ monodll_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONODLL_ODEP) monodll_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp -monodll_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONODLL_ODEP) +monodll_gtk_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp monodll_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONODLL_ODEP) @@ -15719,6 +15873,9 @@ monodll_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONODLL_ODEP) monodll_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp +monodll_gtk1_mnemonics.o: $(srcdir)/src/gtk1/mnemonics.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/mnemonics.cpp + monodll_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp @@ -16172,9 +16329,6 @@ monodll_iphone_evtloop.o: $(srcdir)/src/osx/iphone/evtloop.mm $(MONODLL_ODEP) monodll_iphone_gauge.o: $(srcdir)/src/osx/iphone/gauge.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/gauge.mm -monodll_glcanvas.o: $(srcdir)/src/osx/iphone/glcanvas.mm $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/glcanvas.mm - monodll_iphone_msgdlg.o: $(srcdir)/src/osx/iphone/msgdlg.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/msgdlg.mm @@ -16904,6 +17058,9 @@ monodll_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONODLL_ODEP) monodll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp +monodll_xh_cmdlinkbn.o: $(srcdir)/src/xrc/xh_cmdlinkbn.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_cmdlinkbn.cpp + monodll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp @@ -17033,6 +17190,9 @@ monodll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONODLL_ODEP) monodll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp +monodll_xh_toolbk.o: $(srcdir)/src/xrc/xh_toolbk.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolbk.cpp + monodll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp @@ -19550,9 +19710,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp +@COND_USE_GUI_1@monodll_arttango.o: $(srcdir)/src/common/arttango.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/arttango.cpp + @COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp +@COND_USE_GUI_1@monodll_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp + @COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp @@ -19562,6 +19728,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp +@COND_USE_GUI_1@monodll_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp + +@COND_USE_GUI_1@monodll_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp + @COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -19574,6 +19746,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp +@COND_USE_GUI_1@monodll_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp + @COND_USE_GUI_1@monodll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp @@ -19595,9 +19770,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp -@COND_USE_GUI_1@monodll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp - @COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp @@ -19610,6 +19782,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp +@COND_USE_GUI_1@monodll_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp + @COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -19655,6 +19830,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp +@COND_USE_GUI_1@monodll_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp + @COND_USE_GUI_1@monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp @@ -19769,6 +19947,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp +@COND_USE_GUI_1@monodll_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp + @COND_USE_GUI_1@monodll_persist.o: $(srcdir)/src/common/persist.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/persist.cpp @@ -19784,6 +19965,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp +@COND_USE_GUI_1@monodll_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp + @COND_USE_GUI_1@monodll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp @@ -19796,12 +19980,21 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp +@COND_USE_GUI_1@monodll_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp + @COND_USE_GUI_1@monodll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp +@COND_USE_GUI_1@monodll_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp + +@COND_USE_GUI_1@monodll_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp + @COND_USE_GUI_1@monodll_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp @@ -19811,6 +20004,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp +@COND_USE_GUI_1@monodll_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp + +@COND_USE_GUI_1@monodll_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp + +@COND_USE_GUI_1@monodll_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp + @COND_USE_GUI_1@monodll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp @@ -19970,9 +20172,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp +@COND_USE_GUI_1@monodll_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp + @COND_USE_GUI_1@monodll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp +@COND_USE_GUI_1@monodll_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp + @COND_USE_GUI_1@monodll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp @@ -20072,12 +20280,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp @@ -20273,6 +20475,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp @@ -20319,7 +20527,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL monolib_any.o: $(srcdir)/src/common/any.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/any.cpp @@ -20834,7 +21042,7 @@ monolib_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONOLIB_ODEP) monolib_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp -monolib_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONOLIB_ODEP) +monolib_gtk_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp monolib_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONOLIB_ODEP) @@ -20942,6 +21150,9 @@ monolib_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONOLIB_ODEP) monolib_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp +monolib_gtk1_mnemonics.o: $(srcdir)/src/gtk1/mnemonics.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/mnemonics.cpp + monolib_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp @@ -21395,9 +21606,6 @@ monolib_iphone_evtloop.o: $(srcdir)/src/osx/iphone/evtloop.mm $(MONOLIB_ODEP) monolib_iphone_gauge.o: $(srcdir)/src/osx/iphone/gauge.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/gauge.mm -monolib_glcanvas.o: $(srcdir)/src/osx/iphone/glcanvas.mm $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/glcanvas.mm - monolib_iphone_msgdlg.o: $(srcdir)/src/osx/iphone/msgdlg.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/msgdlg.mm @@ -22127,6 +22335,9 @@ monolib_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONOLIB_ODEP) monolib_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp +monolib_xh_cmdlinkbn.o: $(srcdir)/src/xrc/xh_cmdlinkbn.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_cmdlinkbn.cpp + monolib_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp @@ -22256,6 +22467,9 @@ monolib_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONOLIB_ODEP) monolib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp +monolib_xh_toolbk.o: $(srcdir)/src/xrc/xh_toolbk.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolbk.cpp + monolib_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp @@ -24773,9 +24987,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/artstd.cpp +@COND_USE_GUI_1@monolib_arttango.o: $(srcdir)/src/common/arttango.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arttango.cpp + @COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp +@COND_USE_GUI_1@monolib_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp + @COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp @@ -24785,6 +25005,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp +@COND_USE_GUI_1@monolib_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp + +@COND_USE_GUI_1@monolib_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp + @COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -24797,6 +25023,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp +@COND_USE_GUI_1@monolib_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp + @COND_USE_GUI_1@monolib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp @@ -24818,9 +25047,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp -@COND_USE_GUI_1@monolib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp - @COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp @@ -24833,6 +25059,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp +@COND_USE_GUI_1@monolib_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp + @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -24878,6 +25107,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp +@COND_USE_GUI_1@monolib_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp + @COND_USE_GUI_1@monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp @@ -24992,6 +25224,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp +@COND_USE_GUI_1@monolib_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp + @COND_USE_GUI_1@monolib_persist.o: $(srcdir)/src/common/persist.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/persist.cpp @@ -25007,6 +25242,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp +@COND_USE_GUI_1@monolib_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp + @COND_USE_GUI_1@monolib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp @@ -25019,12 +25257,21 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp +@COND_USE_GUI_1@monolib_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp + @COND_USE_GUI_1@monolib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp +@COND_USE_GUI_1@monolib_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp + +@COND_USE_GUI_1@monolib_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp + @COND_USE_GUI_1@monolib_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp @@ -25034,6 +25281,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp +@COND_USE_GUI_1@monolib_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp + +@COND_USE_GUI_1@monolib_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp + +@COND_USE_GUI_1@monolib_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp + @COND_USE_GUI_1@monolib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp @@ -25193,9 +25449,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp +@COND_USE_GUI_1@monolib_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp + @COND_USE_GUI_1@monolib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp +@COND_USE_GUI_1@monolib_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp + @COND_USE_GUI_1@monolib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp @@ -25295,12 +25557,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp @@ -25496,6 +25752,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp @@ -25542,7 +25804,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 basedll_any.o: $(srcdir)/src/common/any.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/any.cpp @@ -26547,7 +26809,7 @@ baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP) $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -26664,7 +26926,7 @@ netlib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETLIB_ODEP) @COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -26774,7 +27036,7 @@ coredll_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(COREDLL_ODEP) coredll_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp -coredll_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(COREDLL_ODEP) +coredll_gtk_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp coredll_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(COREDLL_ODEP) @@ -26882,6 +27144,9 @@ coredll_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(COREDLL_ODEP) coredll_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp +coredll_gtk1_mnemonics.o: $(srcdir)/src/gtk1/mnemonics.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/mnemonics.cpp + coredll_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp @@ -27335,9 +27600,6 @@ coredll_iphone_evtloop.o: $(srcdir)/src/osx/iphone/evtloop.mm $(COREDLL_ODEP) coredll_iphone_gauge.o: $(srcdir)/src/osx/iphone/gauge.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/gauge.mm -coredll_glcanvas.o: $(srcdir)/src/osx/iphone/glcanvas.mm $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/glcanvas.mm - coredll_iphone_msgdlg.o: $(srcdir)/src/osx/iphone/msgdlg.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/msgdlg.mm @@ -30179,9 +30441,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_artstd.o: $(srcdir)/src/common/artstd.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp +@COND_USE_GUI_1@coredll_arttango.o: $(srcdir)/src/common/arttango.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/arttango.cpp + @COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp +@COND_USE_GUI_1@coredll_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp + @COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp @@ -30191,6 +30459,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_cairo.o: $(srcdir)/src/common/cairo.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp +@COND_USE_GUI_1@coredll_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp + +@COND_USE_GUI_1@coredll_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp + @COND_USE_GUI_1@coredll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -30203,6 +30477,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp +@COND_USE_GUI_1@coredll_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp + @COND_USE_GUI_1@coredll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp @@ -30224,9 +30501,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp -@COND_USE_GUI_1@coredll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp - @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp @@ -30239,6 +30513,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp +@COND_USE_GUI_1@coredll_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp + @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -30284,6 +30561,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp +@COND_USE_GUI_1@coredll_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp + @COND_USE_GUI_1@coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp @@ -30398,6 +30678,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp +@COND_USE_GUI_1@coredll_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp + @COND_USE_GUI_1@coredll_persist.o: $(srcdir)/src/common/persist.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/persist.cpp @@ -30413,6 +30696,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_quantize.o: $(srcdir)/src/common/quantize.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp +@COND_USE_GUI_1@coredll_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp + @COND_USE_GUI_1@coredll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp @@ -30425,12 +30711,21 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp +@COND_USE_GUI_1@coredll_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp + @COND_USE_GUI_1@coredll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp +@COND_USE_GUI_1@coredll_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp + +@COND_USE_GUI_1@coredll_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp + @COND_USE_GUI_1@coredll_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp @@ -30440,6 +30735,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp +@COND_USE_GUI_1@coredll_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp + +@COND_USE_GUI_1@coredll_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp + +@COND_USE_GUI_1@coredll_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp + @COND_USE_GUI_1@coredll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp @@ -30695,7 +30999,7 @@ corelib_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(CORELIB_ODEP) corelib_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp -corelib_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(CORELIB_ODEP) +corelib_gtk_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp corelib_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(CORELIB_ODEP) @@ -30803,6 +31107,9 @@ corelib_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(CORELIB_ODEP) corelib_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp +corelib_gtk1_mnemonics.o: $(srcdir)/src/gtk1/mnemonics.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/mnemonics.cpp + corelib_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp @@ -31256,9 +31563,6 @@ corelib_iphone_evtloop.o: $(srcdir)/src/osx/iphone/evtloop.mm $(CORELIB_ODEP) corelib_iphone_gauge.o: $(srcdir)/src/osx/iphone/gauge.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/gauge.mm -corelib_glcanvas.o: $(srcdir)/src/osx/iphone/glcanvas.mm $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/glcanvas.mm - corelib_iphone_msgdlg.o: $(srcdir)/src/osx/iphone/msgdlg.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/msgdlg.mm @@ -34100,9 +34404,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_artstd.o: $(srcdir)/src/common/artstd.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/artstd.cpp +@COND_USE_GUI_1@corelib_arttango.o: $(srcdir)/src/common/arttango.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/arttango.cpp + @COND_USE_GUI_1@corelib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp +@COND_USE_GUI_1@corelib_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp + @COND_USE_GUI_1@corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp @@ -34112,6 +34422,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_cairo.o: $(srcdir)/src/common/cairo.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp +@COND_USE_GUI_1@corelib_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp + +@COND_USE_GUI_1@corelib_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp + @COND_USE_GUI_1@corelib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -34124,6 +34440,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp +@COND_USE_GUI_1@corelib_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp + @COND_USE_GUI_1@corelib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp @@ -34145,9 +34464,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp -@COND_USE_GUI_1@corelib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp - @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp @@ -34160,6 +34476,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp +@COND_USE_GUI_1@corelib_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp + @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -34205,6 +34524,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp +@COND_USE_GUI_1@corelib_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp + @COND_USE_GUI_1@corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp @@ -34319,6 +34641,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_paper.o: $(srcdir)/src/common/paper.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp +@COND_USE_GUI_1@corelib_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp + @COND_USE_GUI_1@corelib_persist.o: $(srcdir)/src/common/persist.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/persist.cpp @@ -34334,6 +34659,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_quantize.o: $(srcdir)/src/common/quantize.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp +@COND_USE_GUI_1@corelib_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp + @COND_USE_GUI_1@corelib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp @@ -34346,12 +34674,21 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp +@COND_USE_GUI_1@corelib_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp + @COND_USE_GUI_1@corelib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp @COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp +@COND_USE_GUI_1@corelib_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp + +@COND_USE_GUI_1@corelib_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp + @COND_USE_GUI_1@corelib_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp @@ -34361,6 +34698,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp +@COND_USE_GUI_1@corelib_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp + +@COND_USE_GUI_1@corelib_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp + +@COND_USE_GUI_1@corelib_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp + @COND_USE_GUI_1@corelib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp @@ -34509,7 +34855,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --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_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_ADV + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --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_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_ADV advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp @@ -34544,9 +34890,15 @@ advdll_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(ADVDLL_ODEP) advdll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp +advdll_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp + advdll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp +advdll_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp + advdll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp @@ -34646,12 +34998,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_WINCE@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp -@COND_TOOLKIT_MSW@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp - -@COND_TOOLKIT_WINCE@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp - @COND_TOOLKIT_MSW@advdll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp @@ -34847,6 +35193,12 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp +@COND_TOOLKIT_MSW_WXUNIV_0@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP) +@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp + +@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP) +@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp + @COND_TOOLKIT_MSW_WXUNIV_0@advdll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp @@ -34892,9 +35244,15 @@ advlib_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(ADVLIB_ODEP) advlib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp +advlib_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(ADVLIB_ODEP) + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp + advlib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp +advlib_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(ADVLIB_ODEP) + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp + advlib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp @@ -34994,12 +35352,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_WINCE@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp -@COND_TOOLKIT_MSW@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp - -@COND_TOOLKIT_WINCE@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp - @COND_TOOLKIT_MSW@advlib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp @@ -35195,6 +35547,12 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp +@COND_TOOLKIT_MSW_WXUNIV_0@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP) +@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp + +@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP) +@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp + @COND_TOOLKIT_MSW_WXUNIV_0@advlib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp @@ -35208,7 +35566,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP) $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp @@ -35283,7 +35641,7 @@ medialib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_HTML + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_HTML htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP) $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp @@ -35454,7 +35812,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_QA + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_QA qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP) $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp @@ -35469,7 +35827,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP) $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP) $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp @@ -35484,7 +35842,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP) $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_XRC + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_XRC xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp @@ -35519,6 +35877,9 @@ xrcdll_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(XRCDLL_ODEP) xrcdll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp +xrcdll_xh_cmdlinkbn.o: $(srcdir)/src/xrc/xh_cmdlinkbn.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_cmdlinkbn.cpp + xrcdll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp @@ -35648,6 +36009,9 @@ xrcdll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(XRCDLL_ODEP) xrcdll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp +xrcdll_xh_toolbk.o: $(srcdir)/src/xrc/xh_toolbk.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolbk.cpp + xrcdll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp @@ -35702,6 +36066,9 @@ xrclib_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(XRCLIB_ODEP) xrclib_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp +xrclib_xh_cmdlinkbn.o: $(srcdir)/src/xrc/xh_cmdlinkbn.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_cmdlinkbn.cpp + xrclib_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp @@ -35831,6 +36198,9 @@ xrclib_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(XRCLIB_ODEP) xrclib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp +xrclib_xh_toolbk.o: $(srcdir)/src/xrc/xh_toolbk.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolbk.cpp + xrclib_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp @@ -35853,7 +36223,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_AUI + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_AUI auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP) $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp @@ -35892,7 +36262,7 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP) $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON ribbondll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONDLL_ODEP) $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp @@ -35955,7 +36325,7 @@ ribbonlib_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONLIB_ODEP) $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --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_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --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_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID propgriddll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(PROPGRIDDLL_ODEP) $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp @@ -36006,7 +36376,7 @@ propgridlib_props.o: $(srcdir)/src/propgrid/props.cpp $(PROPGRIDLIB_ODEP) $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP) $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp @@ -36069,7 +36439,7 @@ richtextlib_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(RI $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --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_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --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_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP) $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp @@ -36090,7 +36460,7 @@ stclib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCLIB_ODEP) $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_GL + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_GL gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP) $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp @@ -36101,6 +36471,9 @@ gldll_carbon_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLDLL_ODEP) gldll_osx_cocoa_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(GLDLL_ODEP) $(CXXC) -c -o $@ $(GLDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm +gldll_iphone_glcanvas.o: $(srcdir)/src/osx/iphone/glcanvas.mm $(GLDLL_ODEP) + $(CXXC) -c -o $@ $(GLDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/glcanvas.mm + gldll_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLDLL_ODEP) $(CXXC) -c -o $@ $(GLDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm @@ -36119,6 +36492,9 @@ gldll_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLDLL_ODEP) @COND_TOOLKIT_OSX_COCOA@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP) @COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp +@COND_TOOLKIT_OSX_IPHONE@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP) +@COND_TOOLKIT_OSX_IPHONE@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp @@ -36152,6 +36528,9 @@ gllib_carbon_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLLIB_ODEP) gllib_osx_cocoa_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(GLLIB_ODEP) $(CXXC) -c -o $@ $(GLLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm +gllib_iphone_glcanvas.o: $(srcdir)/src/osx/iphone/glcanvas.mm $(GLLIB_ODEP) + $(CXXC) -c -o $@ $(GLLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/glcanvas.mm + gllib_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLLIB_ODEP) $(CXXC) -c -o $@ $(GLLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm @@ -36170,6 +36549,9 @@ gllib_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP) @COND_TOOLKIT_OSX_COCOA@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP) @COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp +@COND_TOOLKIT_OSX_IPHONE@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP) +@COND_TOOLKIT_OSX_IPHONE@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp @@ -36347,6 +36729,7 @@ ALL_DIST: distrib_clean mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets + $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/wx_presets.py $(DISTDIR)/build/bakefiles/wxpresets/presets mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample @@ -36372,10 +36755,12 @@ ALL_GUI_DIST: ALL_DIST fi mkdir $(DISTDIR)/include/wx/meta mkdir $(DISTDIR)/include/wx/generic + mkdir $(DISTDIR)/include/wx/generic/private mkdir $(DISTDIR)/include/wx/html mkdir $(DISTDIR)/include/wx/richtext mkdir $(DISTDIR)/include/wx/aui mkdir $(DISTDIR)/include/wx/ribbon + mkdir $(DISTDIR)/include/wx/persist mkdir $(DISTDIR)/include/wx/propgrid mkdir $(DISTDIR)/include/wx/stc mkdir $(DISTDIR)/include/wx/protocol @@ -36387,17 +36772,19 @@ ALL_GUI_DIST: ALL_DIST $(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx $(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta $(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic + $(CP_P) $(INCDIR)/wx/generic/private/*.h $(DISTDIR)/include/wx/generic/private $(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html $(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext $(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui $(CP_P) $(INCDIR)/wx/ribbon/*.h $(DISTDIR)/include/wx/ribbon + $(CP_P) $(INCDIR)/wx/persist/*.h $(DISTDIR)/include/wx/persist $(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid $(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc + $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix $(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private $(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc - $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/art mkdir $(DISTDIR)/art/gtk @@ -36431,7 +36818,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/aui $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui - + mkdir $(DISTDIR)/src/ribbon $(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon @@ -36500,6 +36887,7 @@ BASE_DIST: ALL_DIST INTL_DIST mkdir $(DISTDIR)/include/wx/richtext mkdir $(DISTDIR)/include/wx/aui mkdir $(DISTDIR)/include/wx/ribbon + mkdir $(DISTDIR)/include/wx/persist mkdir $(DISTDIR)/include/wx/propgrid mkdir $(DISTDIR)/include/wx/stc mkdir $(DISTDIR)/include/wx/osx @@ -36777,9 +37165,12 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples - # copy files common to all samples in a general way + # copy files common to all samples in a general way (samples without + # Makefile.in in them are Windows-specific and shouldn't be included in + # Unix distribution) for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \ -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \ + if [ ! -f $$s/Makefile.in ]; then continue; fi; \ t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \ mkdir -p $$t; \ $(CP_P) $$s/Makefile.in \ @@ -36800,8 +37191,6 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate $(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate - $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console - $(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd @@ -36857,7 +37246,6 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc $(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc $(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc - $(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils @@ -36921,7 +37309,6 @@ INTL_DIST: mkdir $(DISTDIR)/locale $(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale $(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale - -$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \ for dir in "$$subdirs"; do \ mkdir $(DISTDIR)/locale/$$dir; \ @@ -36956,6 +37343,7 @@ MANUAL_DIST: mkdir $(DISTDIR)/interface/wx/html mkdir $(DISTDIR)/interface/wx/msw mkdir $(DISTDIR)/interface/wx/msw/ole + mkdir $(DISTDIR)/interface/wx/persist mkdir $(DISTDIR)/interface/wx/protocol mkdir $(DISTDIR)/interface/wx/propgrid mkdir $(DISTDIR)/interface/wx/richtext @@ -36969,6 +37357,7 @@ MANUAL_DIST: $(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html $(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw $(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole + $(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist $(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol $(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid $(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext @@ -37135,8 +37524,8 @@ rpm: bzip-dist -mkdir $(RPMTOP)/RPMS -mkdir $(RPMTOP)/SRPMS cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES - rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec - mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` . + rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec + mv -f `find $(RPMTOP) -name "wx-*.rpm"` . # Include dependency info, if present: