X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b8ef0b35d674bc262eb2005ac1321762c831d31..125e7c11c16f23daa4c594f3b8d90194099c2394:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 2b6de3e20a..febf89f088 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.8 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -426,6 +426,7 @@ ALL_BASE_HEADERS = \ wx/tokenzr.h \ wx/tracker.h \ wx/txtstrm.h \ + wx/typeinfo.h \ wx/types.h \ wx/unichar.h \ wx/uri.h \ @@ -589,6 +590,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/tokenzr.h \ wx/tracker.h \ wx/txtstrm.h \ + wx/typeinfo.h \ wx/types.h \ wx/unichar.h \ wx/uri.h \ @@ -622,6 +624,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2046,6 +2049,7 @@ COND_TOOLKIT__BASE_OSX_SRC = \ src/unix/fswatcher_kqueue.cpp \ src/unix/mimetype.cpp \ src/osx/core/cfstring.cpp \ + src/osx/core/evtloop_cf.cpp \ src/osx/core/stdpaths_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/core/utilsexc_base.cpp @@ -2068,6 +2072,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_SRC = \ src/unix/fswatcher_kqueue.cpp \ src/unix/mimetype.cpp \ src/osx/core/cfstring.cpp \ + src/osx/core/evtloop_cf.cpp \ src/osx/core/stdpaths_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/core/utilsexc_base.cpp @@ -2090,6 +2095,7 @@ COND_TOOLKIT_GTK_BASE_OSX_SRC = \ src/unix/fswatcher_kqueue.cpp \ src/unix/mimetype.cpp \ src/osx/core/cfstring.cpp \ + src/osx/core/evtloop_cf.cpp \ src/osx/core/stdpaths_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/core/utilsexc_base.cpp @@ -2112,6 +2118,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_SRC = \ src/unix/fswatcher_kqueue.cpp \ src/unix/mimetype.cpp \ src/osx/core/cfstring.cpp \ + src/osx/core/evtloop_cf.cpp \ src/osx/core/stdpaths_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/core/utilsexc_base.cpp @@ -2119,6 +2126,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_SRC = \ COND_TOOLKIT_OSX_CARBON_BASE_OSX_SRC = \ src/osx/core/mimetype.cpp \ src/osx/core/cfstring.cpp \ + src/osx/core/evtloop_cf.cpp \ src/osx/core/stdpaths_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/core/utilsexc_base.cpp \ @@ -2141,6 +2149,7 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_SRC = \ COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC = \ src/osx/core/mimetype.cpp \ src/osx/core/cfstring.cpp \ + src/osx/core/evtloop_cf.cpp \ src/osx/core/stdpaths_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/core/utilsexc_base.cpp \ @@ -2178,6 +2187,7 @@ COND_TOOLKIT_X11_BASE_OSX_SRC = \ src/unix/fswatcher_kqueue.cpp \ src/unix/mimetype.cpp \ src/osx/core/cfstring.cpp \ + src/osx/core/evtloop_cf.cpp \ src/osx/core/stdpaths_cf.cpp \ src/osx/core/strconv_cf.cpp \ src/osx/core/utilsexc_base.cpp @@ -2188,6 +2198,7 @@ COND_TOOLKIT__BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2209,6 +2220,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2230,6 +2242,7 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2251,6 +2264,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2279,6 +2293,7 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2298,6 +2313,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2310,6 +2326,7 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2344,6 +2361,7 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2459,6 +2477,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR = \ wx/gtk/dcscreen.h \ wx/gtk/dnd.h \ wx/gtk/evtloop.h \ + wx/gtk/evtloopsrc.h \ wx/gtk/font.h \ wx/gtk/minifram.h \ wx/gtk/pen.h \ @@ -2688,7 +2707,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR = \ wx/gtk1/statbox.h \ wx/gtk1/statline.h \ wx/gtk1/stattext.h \ - wx/gtk1/tbargtk.h \ + wx/gtk1/tooltip.h \ wx/gtk1/textctrl.h \ wx/gtk1/tglbtn.h \ wx/gtk1/treectrl.h @@ -2740,7 +2759,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \ wx/gtk/statbox.h \ wx/gtk/statline.h \ wx/gtk/stattext.h \ - wx/gtk/tbargtk.h \ + wx/gtk/toolbar.h \ wx/gtk/textctrl.h \ wx/gtk/textentry.h \ wx/gtk/tglbtn.h \ @@ -2967,6 +2986,7 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR = \ wx/osx/dirdlg.h \ wx/osx/dnd.h \ wx/osx/evtloop.h \ + wx/osx/evtloopsrc.h \ wx/osx/filedlg.h \ wx/osx/font.h \ wx/osx/fontdlg.h \ @@ -3070,6 +3090,7 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \ wx/osx/dirdlg.h \ wx/osx/dnd.h \ wx/osx/evtloop.h \ + wx/osx/evtloopsrc.h \ wx/osx/filedlg.h \ wx/osx/font.h \ wx/osx/fontdlg.h \ @@ -3381,6 +3402,8 @@ COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR = \ COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR = \ wx/generic/animate.h \ wx/osx/dataview.h \ + wx/osx/dvrenderer.h \ + wx/osx/dvrenderers.h \ wx/osx/joystick.h \ wx/osx/sound.h \ wx/osx/taskbarosx.h \ @@ -3391,6 +3414,8 @@ COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR = \ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR = \ wx/generic/animate.h \ wx/osx/dataview.h \ + wx/osx/dvrenderer.h \ + wx/osx/dvrenderers.h \ wx/osx/joystick.h \ wx/osx/sound.h \ wx/osx/taskbarosx.h \ @@ -3408,6 +3433,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \ wx/gtk/bmpcbox.h \ wx/gtk/calctrl.h \ wx/gtk/dataview.h \ + wx/gtk/dvrenderer.h \ + wx/gtk/dvrenderers.h \ wx/gtk/hyperlink.h \ wx/gtk/infobar.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR) @@ -3426,12 +3453,15 @@ COND_WXUNIV_0_ADVANCED_HDR = \ wx/datectrl.h \ wx/dateevt.h \ wx/dcbuffer.h \ + wx/dvrenderers.h \ wx/editlbox.h \ wx/generic/aboutdlgg.h \ wx/generic/bmpcbox.h \ wx/generic/calctrlg.h \ wx/generic/datectrl.h \ wx/generic/dataview.h \ + wx/generic/dvrenderer.h \ + wx/generic/dvrenderers.h \ wx/generic/grid.h \ wx/generic/gridctrl.h \ wx/generic/grideditors.h \ @@ -3471,12 +3501,15 @@ COND_WXUNIV_1_ADVANCED_HDR = \ wx/datectrl.h \ wx/dateevt.h \ wx/dcbuffer.h \ + wx/dvrenderers.h \ wx/editlbox.h \ wx/generic/aboutdlgg.h \ wx/generic/bmpcbox.h \ wx/generic/calctrlg.h \ wx/generic/datectrl.h \ wx/generic/dataview.h \ + wx/generic/dvrenderer.h \ + wx/generic/dvrenderers.h \ wx/generic/grid.h \ wx/generic/gridctrl.h \ wx/generic/grideditors.h \ @@ -3703,6 +3736,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/docview.h \ wx/effects.h \ wx/evtloop.h \ + wx/evtloopsrc.h \ wx/fdrepdlg.h \ wx/filectrl.h \ wx/filepicker.h \ @@ -3960,6 +3994,7 @@ COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_uninst_cmd = rm -f \ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_core_mimetype.o \ monodll_cfstring.o \ + monodll_evtloop_cf.o \ monodll_stdpaths_cf.o \ monodll_strconv_cf.o \ monodll_utilsexc_base.o \ @@ -4228,6 +4263,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_fontpickercmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ + monodll_graphicc.o \ monodll_fontenumcmn.o \ monodll_fontmap.o \ monodll_fontutilcmn.o \ @@ -4421,6 +4457,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_fontpickercmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ + monodll_graphicc.o \ monodll_fontenumcmn.o \ monodll_fontmap.o \ monodll_fontutilcmn.o \ @@ -4840,7 +4877,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_src_cocoa_choice.o \ monodll_cocoa_clipbrd.o \ monodll_cocoa_colordlg.o \ - monodll_cocoa_colour.o \ + monodll_src_cocoa_colour.o \ monodll_cocoa_combobox.o \ monodll_cocoa_control.o \ monodll_cocoa_cursor.o \ @@ -4950,7 +4987,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_gtk1_statbox.o \ monodll_gtk1_statline.o \ monodll_gtk1_stattext.o \ - monodll_gtk1_tbargtk.o \ + monodll_gtk1_tooltip.o \ monodll_gtk1_textctrl.o \ monodll_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS) @@ -4958,7 +4995,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_generic_accel.o \ monodll_generic_fdrepdlg.o \ monodll_filepickerg.o \ - monodll_graphicc.o \ monodll_generic_listctrl.o \ monodll_prntdlgg.o \ monodll_generic_statusbr.o \ @@ -5004,7 +5040,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_gtk_statbox.o \ monodll_gtk_statline.o \ monodll_gtk_stattext.o \ - monodll_gtk_tbargtk.o \ + monodll_gtk_toolbar.o \ monodll_gtk_textctrl.o \ monodll_gtk_textentry.o \ monodll_gtk_tglbtn.o \ @@ -5177,6 +5213,7 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS = \ monodll_osx_cocoa_button.o \ monodll_osx_cocoa_checkbox.o \ monodll_osx_cocoa_choice.o \ + monodll_osx_cocoa_colour.o \ monodll_osx_cocoa_dialog.o \ monodll_osx_cocoa_dirdlg.o \ monodll_osx_cocoa_evtloop.o \ @@ -5777,6 +5814,7 @@ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_core_mimetype.o \ monolib_cfstring.o \ + monolib_evtloop_cf.o \ monolib_stdpaths_cf.o \ monolib_strconv_cf.o \ monolib_utilsexc_base.o \ @@ -6045,6 +6083,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_fontpickercmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ + monolib_graphicc.o \ monolib_fontenumcmn.o \ monolib_fontmap.o \ monolib_fontutilcmn.o \ @@ -6238,6 +6277,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_fontpickercmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ + monolib_graphicc.o \ monolib_fontenumcmn.o \ monolib_fontmap.o \ monolib_fontutilcmn.o \ @@ -6657,7 +6697,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_src_cocoa_choice.o \ monolib_cocoa_clipbrd.o \ monolib_cocoa_colordlg.o \ - monolib_cocoa_colour.o \ + monolib_src_cocoa_colour.o \ monolib_cocoa_combobox.o \ monolib_cocoa_control.o \ monolib_cocoa_cursor.o \ @@ -6767,7 +6807,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_gtk1_statbox.o \ monolib_gtk1_statline.o \ monolib_gtk1_stattext.o \ - monolib_gtk1_tbargtk.o \ + monolib_gtk1_tooltip.o \ monolib_gtk1_textctrl.o \ monolib_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1) @@ -6775,7 +6815,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_generic_accel.o \ monolib_generic_fdrepdlg.o \ monolib_filepickerg.o \ - monolib_graphicc.o \ monolib_generic_listctrl.o \ monolib_prntdlgg.o \ monolib_generic_statusbr.o \ @@ -6821,7 +6860,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_gtk_statbox.o \ monolib_gtk_statline.o \ monolib_gtk_stattext.o \ - monolib_gtk_tbargtk.o \ + monolib_gtk_toolbar.o \ monolib_gtk_textctrl.o \ monolib_gtk_textentry.o \ monolib_gtk_tglbtn.o \ @@ -6994,6 +7033,7 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_osx_cocoa_button.o \ monolib_osx_cocoa_checkbox.o \ monolib_osx_cocoa_choice.o \ + monolib_osx_cocoa_colour.o \ monolib_osx_cocoa_dialog.o \ monolib_osx_cocoa_dirdlg.o \ monolib_osx_cocoa_evtloop.o \ @@ -7647,6 +7687,7 @@ COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_uninst_cmd = rm -f \ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_core_mimetype.o \ basedll_cfstring.o \ + basedll_evtloop_cf.o \ basedll_stdpaths_cf.o \ basedll_strconv_cf.o \ basedll_utilsexc_base.o \ @@ -7746,6 +7787,7 @@ COND_MONOLITHIC_0_SHARED_0___baselib___depname = \ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_core_mimetype.o \ baselib_cfstring.o \ + baselib_evtloop_cf.o \ baselib_stdpaths_cf.o \ baselib_strconv_cf.o \ baselib_utilsexc_base.o \ @@ -8050,6 +8092,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_fontpickercmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ + coredll_graphicc.o \ coredll_fontenumcmn.o \ coredll_fontmap.o \ coredll_fontutilcmn.o \ @@ -8243,6 +8286,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_fontpickercmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ + coredll_graphicc.o \ coredll_fontenumcmn.o \ coredll_fontmap.o \ coredll_fontutilcmn.o \ @@ -8662,7 +8706,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_src_cocoa_choice.o \ coredll_cocoa_clipbrd.o \ coredll_cocoa_colordlg.o \ - coredll_cocoa_colour.o \ + coredll_src_cocoa_colour.o \ coredll_cocoa_combobox.o \ coredll_cocoa_control.o \ coredll_cocoa_cursor.o \ @@ -8772,7 +8816,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_gtk1_statbox.o \ coredll_gtk1_statline.o \ coredll_gtk1_stattext.o \ - coredll_gtk1_tbargtk.o \ + coredll_gtk1_tooltip.o \ coredll_gtk1_textctrl.o \ coredll_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2) @@ -8780,7 +8824,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_generic_accel.o \ coredll_generic_fdrepdlg.o \ coredll_filepickerg.o \ - coredll_graphicc.o \ coredll_generic_listctrl.o \ coredll_prntdlgg.o \ coredll_generic_statusbr.o \ @@ -8826,7 +8869,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_gtk_statbox.o \ coredll_gtk_statline.o \ coredll_gtk_stattext.o \ - coredll_gtk_tbargtk.o \ + coredll_gtk_toolbar.o \ coredll_gtk_textctrl.o \ coredll_gtk_textentry.o \ coredll_gtk_tglbtn.o \ @@ -8999,6 +9042,7 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_osx_cocoa_button.o \ coredll_osx_cocoa_checkbox.o \ coredll_osx_cocoa_choice.o \ + coredll_osx_cocoa_colour.o \ coredll_osx_cocoa_dialog.o \ coredll_osx_cocoa_dirdlg.o \ coredll_osx_cocoa_evtloop.o \ @@ -9541,6 +9585,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_fontpickercmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ + corelib_graphicc.o \ corelib_fontenumcmn.o \ corelib_fontmap.o \ corelib_fontutilcmn.o \ @@ -9734,6 +9779,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_fontpickercmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ + corelib_graphicc.o \ corelib_fontenumcmn.o \ corelib_fontmap.o \ corelib_fontutilcmn.o \ @@ -10153,7 +10199,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_src_cocoa_choice.o \ corelib_cocoa_clipbrd.o \ corelib_cocoa_colordlg.o \ - corelib_cocoa_colour.o \ + corelib_src_cocoa_colour.o \ corelib_cocoa_combobox.o \ corelib_cocoa_control.o \ corelib_cocoa_cursor.o \ @@ -10263,7 +10309,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_gtk1_statbox.o \ corelib_gtk1_statline.o \ corelib_gtk1_stattext.o \ - corelib_gtk1_tbargtk.o \ + corelib_gtk1_tooltip.o \ corelib_gtk1_textctrl.o \ corelib_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3) @@ -10271,7 +10317,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_generic_accel.o \ corelib_generic_fdrepdlg.o \ corelib_filepickerg.o \ - corelib_graphicc.o \ corelib_generic_listctrl.o \ corelib_prntdlgg.o \ corelib_generic_statusbr.o \ @@ -10317,7 +10362,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_gtk_statbox.o \ corelib_gtk_statline.o \ corelib_gtk_stattext.o \ - corelib_gtk_tbargtk.o \ + corelib_gtk_toolbar.o \ corelib_gtk_textctrl.o \ corelib_gtk_textentry.o \ corelib_gtk_tglbtn.o \ @@ -10490,6 +10535,7 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_osx_cocoa_button.o \ corelib_osx_cocoa_checkbox.o \ corelib_osx_cocoa_choice.o \ + corelib_osx_cocoa_colour.o \ corelib_osx_cocoa_dialog.o \ corelib_osx_cocoa_dirdlg.o \ corelib_osx_cocoa_evtloop.o \ @@ -13019,7 +13065,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets - (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl $(DESTDIR)$(datadir)/bakefile/presets) + (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) $(DYLIB_RPATH_INSTALL) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx for f in setup.h $(RCDEFS_H); do \ @@ -13053,7 +13099,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4) - (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl) + (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py) for f in setup.h $(RCDEFS_H); do \ rm -f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \ done @@ -14866,6 +14912,9 @@ monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP) monodll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp +monodll_evtloop_cf.o: $(srcdir)/src/osx/core/evtloop_cf.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/evtloop_cf.cpp + monodll_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp @@ -14980,9 +15029,6 @@ monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP) monodll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp -monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp - monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -15103,8 +15149,8 @@ monodll_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONODLL_ODEP) monodll_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp -monodll_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp +monodll_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp monodll_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp @@ -15199,9 +15245,6 @@ monodll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONODLL_ODEP) monodll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp -monodll_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp - monodll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp @@ -15517,6 +15560,9 @@ monodll_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONODLL_ODEP monodll_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm +monodll_osx_cocoa_colour.o: $(srcdir)/src/osx/cocoa/colour.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/colour.mm + monodll_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm @@ -15661,7 +15707,7 @@ monodll_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONODLL_ODEP) monodll_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm -monodll_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONODLL_ODEP) +monodll_src_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm monodll_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONODLL_ODEP) @@ -18718,6 +18764,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_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + @COND_USE_GUI_1@monodll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp @@ -19660,6 +19709,9 @@ monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP) monolib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp +monolib_evtloop_cf.o: $(srcdir)/src/osx/core/evtloop_cf.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/evtloop_cf.cpp + monolib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp @@ -19774,9 +19826,6 @@ monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP) monolib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp -monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp - monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -19897,8 +19946,8 @@ monolib_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONOLIB_ODEP) monolib_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp -monolib_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp +monolib_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp monolib_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp @@ -19993,9 +20042,6 @@ monolib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONOLIB_ODEP) monolib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp -monolib_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp - monolib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp @@ -20311,6 +20357,9 @@ monolib_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONOLIB_ODEP monolib_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm +monolib_osx_cocoa_colour.o: $(srcdir)/src/osx/cocoa/colour.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/colour.mm + monolib_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm @@ -20455,7 +20504,7 @@ monolib_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONOLIB_ODEP) monolib_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm -monolib_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONOLIB_ODEP) +monolib_src_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm monolib_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONOLIB_ODEP) @@ -23512,6 +23561,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_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + @COND_USE_GUI_1@monolib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp @@ -24454,6 +24506,9 @@ basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP) basedll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp +basedll_evtloop_cf.o: $(srcdir)/src/osx/core/evtloop_cf.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/evtloop_cf.cpp + basedll_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp @@ -24946,6 +25001,9 @@ baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP) baselib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp +baselib_evtloop_cf.o: $(srcdir)/src/osx/core/evtloop_cf.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/evtloop_cf.cpp + baselib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp @@ -25276,9 +25334,6 @@ coredll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(COREDLL_ODEP) coredll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp - coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -25399,8 +25454,8 @@ coredll_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(COREDLL_ODEP) coredll_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp -coredll_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp +coredll_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp coredll_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp @@ -25495,9 +25550,6 @@ coredll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(COREDLL_ODEP) coredll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp -coredll_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp - coredll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp @@ -25813,6 +25865,9 @@ coredll_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(COREDLL_ODEP coredll_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm +coredll_osx_cocoa_colour.o: $(srcdir)/src/osx/cocoa/colour.mm $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/colour.mm + coredll_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm @@ -25957,7 +26012,7 @@ coredll_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(COREDLL_ODEP) coredll_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm -coredll_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(COREDLL_ODEP) +coredll_src_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm coredll_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(COREDLL_ODEP) @@ -28486,6 +28541,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_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + @COND_USE_GUI_1@coredll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp @@ -28804,9 +28862,6 @@ corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP) corelib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp - corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -28927,8 +28982,8 @@ corelib_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(CORELIB_ODEP) corelib_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp -corelib_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp +corelib_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp corelib_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp @@ -29023,9 +29078,6 @@ corelib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(CORELIB_ODEP) corelib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp -corelib_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp - corelib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp @@ -29341,6 +29393,9 @@ corelib_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(CORELIB_ODEP corelib_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm +corelib_osx_cocoa_colour.o: $(srcdir)/src/osx/cocoa/colour.mm $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/colour.mm + corelib_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm @@ -29485,7 +29540,7 @@ corelib_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(CORELIB_ODEP) corelib_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm -corelib_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(CORELIB_ODEP) +corelib_src_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm corelib_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(CORELIB_ODEP) @@ -32014,6 +32069,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_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + @COND_USE_GUI_1@corelib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp