solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'more-qt-win-build-fixes' of https://github.com/catalinr/wxWidgets

Browse source 
Miscellaneous fixes for building wxQt under MSW.

See https://github.com/wxWidgets/wxWidgets/pull/918
This commit is contained in:
Vadim Zeitlin 2018-09-17 23:26:27 +02:00
commit 1f435261f6
20 changed files with 221 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

322
Makefile.in
View file

@ -2237,7 +2237,7 @@ COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM = \
@COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h @COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
@COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
@COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h @COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
@COND_TOOLKIT_Qt@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h @COND_TOOLKIT_QT@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h
@COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_GTK_HDR = wx/aui/tabartgtk.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_GTK_HDR = wx/aui/tabartgtk.h
@COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h wx/aui/barartmsw.h @COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h wx/aui/barartmsw.h
@ -5631,6 +5631,19 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS = \
monodll_animateg.o monodll_animateg.o
@COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS) @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS)
COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_generic_caret.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
monodll_generic_fdrepdlg.o \
monodll_filepickerg.o \
monodll_fontpickerg.o \
monodll_generic_icon.o \
monodll_generic_imaglist.o \
monodll_prntdlgg.o \
monodll_generic_textmeasure.o \
monodll_animateg.o \
monodll_generic_activityindicator.o \
monodll_qt_accel.o \ monodll_qt_accel.o \
monodll_qt_app.o \ monodll_qt_app.o \
monodll_qt_apptraits.o \ monodll_qt_apptraits.o \
@ -5639,14 +5652,12 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_qt_brush.o \ monodll_qt_brush.o \
monodll_qt_anybutton.o \ monodll_qt_anybutton.o \
monodll_qt_button.o \ monodll_qt_button.o \
monodll_generic_caret.o \ monodll_qt_calctrl.o \
monodll_qt_checkbox.o \ monodll_qt_checkbox.o \
monodll_qt_checklst.o \ monodll_qt_checklst.o \
monodll_qt_choice.o \ monodll_qt_choice.o \
monodll_qt_clipbrd.o \ monodll_qt_clipbrd.o \
monodll_qt_clrpicker.o \ monodll_qt_clrpicker.o \
monodll_clrpickerg.o \
monodll_collpaneg.o \
monodll_qt_colordlg.o \ monodll_qt_colordlg.o \
monodll_qt_colour.o \ monodll_qt_colour.o \
monodll_qt_combobox.o \ monodll_qt_combobox.o \
@ -5655,6 +5666,7 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_qt_ctrlsub.o \ monodll_qt_ctrlsub.o \
monodll_qt_cursor.o \ monodll_qt_cursor.o \
monodll_qt_dataobj.o \ monodll_qt_dataobj.o \
monodll_qt_dataview.o \
monodll_qt_dcclient.o \ monodll_qt_dcclient.o \
monodll_qt_dc.o \ monodll_qt_dc.o \
monodll_qt_dcmemory.o \ monodll_qt_dcmemory.o \
@ -5662,22 +5674,18 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_qt_dcscreen.o \ monodll_qt_dcscreen.o \
monodll_defs.o \ monodll_defs.o \
monodll_qt_dialog.o \ monodll_qt_dialog.o \
monodll_unix_dialup.o \
monodll_qt_display.o \ monodll_qt_display.o \
monodll_qt_dnd.o \ monodll_qt_dnd.o \
monodll_dvrenderer.o \
monodll_dvrenderers.o \
monodll_qt_evtloop.o \ monodll_qt_evtloop.o \
monodll_generic_fdrepdlg.o \
monodll_qt_filedlg.o \ monodll_qt_filedlg.o \
monodll_filepickerg.o \
monodll_qt_font.o \ monodll_qt_font.o \
monodll_qt_fontdlg.o \ monodll_qt_fontdlg.o \
monodll_qt_fontutil.o \ monodll_qt_fontutil.o \
monodll_qt_fontenum.o \ monodll_qt_fontenum.o \
monodll_fontpickerg.o \
monodll_qt_frame.o \ monodll_qt_frame.o \
monodll_qt_gauge.o \ monodll_qt_gauge.o \
monodll_generic_icon.o \
monodll_generic_imaglist.o \
monodll_qt_listbox.o \ monodll_qt_listbox.o \
monodll_qt_listctrl.o \ monodll_qt_listctrl.o \
monodll_qt_mdi.o \ monodll_qt_mdi.o \
@ -5691,7 +5699,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_qt_pen.o \ monodll_qt_pen.o \
monodll_qt_popupwin.o \ monodll_qt_popupwin.o \
monodll_qt_printdlg.o \ monodll_qt_printdlg.o \
monodll_prntdlgg.o \
monodll_printqt.o \ monodll_printqt.o \
monodll_qt_radiobox.o \ monodll_qt_radiobox.o \
monodll_qt_radiobut.o \ monodll_qt_radiobut.o \
@ -5707,9 +5714,9 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_qt_statline.o \ monodll_qt_statline.o \
monodll_qt_stattext.o \ monodll_qt_stattext.o \
monodll_qt_statusbar.o \ monodll_qt_statusbar.o \
monodll_qt_taskbar.o \
monodll_qt_textctrl.o \ monodll_qt_textctrl.o \
monodll_qt_textentry.o \ monodll_qt_textentry.o \
monodll_generic_textmeasure.o \
monodll_qt_tglbtn.o \ monodll_qt_tglbtn.o \
monodll_qt_timer.o \ monodll_qt_timer.o \
monodll_qt_toolbar.o \ monodll_qt_toolbar.o \
@ -5717,17 +5724,7 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_qt_toplevel.o \ monodll_qt_toplevel.o \
monodll_qt_uiaction.o \ monodll_qt_uiaction.o \
monodll_qt_utils.o \ monodll_qt_utils.o \
monodll_qt_window.o \ monodll_qt_window.o
monodll_taskbarcmn.o \
monodll_unix_joystick.o \
monodll_qt_taskbar.o \
monodll_dvrenderer.o \
monodll_animateg.o \
monodll_qt_dataview.o \
monodll_unix_sound.o \
monodll_generic_activityindicator.o \
monodll_qt_calctrl.o \
monodll_dvrenderers.o
@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS) @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_fontmgrcmn.o \ monodll_fontmgrcmn.o \
@ -7596,6 +7593,19 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 = \
monolib_animateg.o monolib_animateg.o
@COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1) @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_taskbarcmn.o \
monolib_generic_caret.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
monolib_generic_fdrepdlg.o \
monolib_filepickerg.o \
monolib_fontpickerg.o \
monolib_generic_icon.o \
monolib_generic_imaglist.o \
monolib_prntdlgg.o \
monolib_generic_textmeasure.o \
monolib_animateg.o \
monolib_generic_activityindicator.o \
monolib_qt_accel.o \ monolib_qt_accel.o \
monolib_qt_app.o \ monolib_qt_app.o \
monolib_qt_apptraits.o \ monolib_qt_apptraits.o \
@ -7604,14 +7614,12 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_qt_brush.o \ monolib_qt_brush.o \
monolib_qt_anybutton.o \ monolib_qt_anybutton.o \
monolib_qt_button.o \ monolib_qt_button.o \
monolib_generic_caret.o \ monolib_qt_calctrl.o \
monolib_qt_checkbox.o \ monolib_qt_checkbox.o \
monolib_qt_checklst.o \ monolib_qt_checklst.o \
monolib_qt_choice.o \ monolib_qt_choice.o \
monolib_qt_clipbrd.o \ monolib_qt_clipbrd.o \
monolib_qt_clrpicker.o \ monolib_qt_clrpicker.o \
monolib_clrpickerg.o \
monolib_collpaneg.o \
monolib_qt_colordlg.o \ monolib_qt_colordlg.o \
monolib_qt_colour.o \ monolib_qt_colour.o \
monolib_qt_combobox.o \ monolib_qt_combobox.o \
@ -7620,6 +7628,7 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_qt_ctrlsub.o \ monolib_qt_ctrlsub.o \
monolib_qt_cursor.o \ monolib_qt_cursor.o \
monolib_qt_dataobj.o \ monolib_qt_dataobj.o \
monolib_qt_dataview.o \
monolib_qt_dcclient.o \ monolib_qt_dcclient.o \
monolib_qt_dc.o \ monolib_qt_dc.o \
monolib_qt_dcmemory.o \ monolib_qt_dcmemory.o \
@ -7627,22 +7636,18 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_qt_dcscreen.o \ monolib_qt_dcscreen.o \
monolib_defs.o \ monolib_defs.o \
monolib_qt_dialog.o \ monolib_qt_dialog.o \
monolib_unix_dialup.o \
monolib_qt_display.o \ monolib_qt_display.o \
monolib_qt_dnd.o \ monolib_qt_dnd.o \
monolib_dvrenderer.o \
monolib_dvrenderers.o \
monolib_qt_evtloop.o \ monolib_qt_evtloop.o \
monolib_generic_fdrepdlg.o \
monolib_qt_filedlg.o \ monolib_qt_filedlg.o \
monolib_filepickerg.o \
monolib_qt_font.o \ monolib_qt_font.o \
monolib_qt_fontdlg.o \ monolib_qt_fontdlg.o \
monolib_qt_fontutil.o \ monolib_qt_fontutil.o \
monolib_qt_fontenum.o \ monolib_qt_fontenum.o \
monolib_fontpickerg.o \
monolib_qt_frame.o \ monolib_qt_frame.o \
monolib_qt_gauge.o \ monolib_qt_gauge.o \
monolib_generic_icon.o \
monolib_generic_imaglist.o \
monolib_qt_listbox.o \ monolib_qt_listbox.o \
monolib_qt_listctrl.o \ monolib_qt_listctrl.o \
monolib_qt_mdi.o \ monolib_qt_mdi.o \
@ -7656,7 +7661,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_qt_pen.o \ monolib_qt_pen.o \
monolib_qt_popupwin.o \ monolib_qt_popupwin.o \
monolib_qt_printdlg.o \ monolib_qt_printdlg.o \
monolib_prntdlgg.o \
monolib_printqt.o \ monolib_printqt.o \
monolib_qt_radiobox.o \ monolib_qt_radiobox.o \
monolib_qt_radiobut.o \ monolib_qt_radiobut.o \
@ -7672,9 +7676,9 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_qt_statline.o \ monolib_qt_statline.o \
monolib_qt_stattext.o \ monolib_qt_stattext.o \
monolib_qt_statusbar.o \ monolib_qt_statusbar.o \
monolib_qt_taskbar.o \
monolib_qt_textctrl.o \ monolib_qt_textctrl.o \
monolib_qt_textentry.o \ monolib_qt_textentry.o \
monolib_generic_textmeasure.o \
monolib_qt_tglbtn.o \ monolib_qt_tglbtn.o \
monolib_qt_timer.o \ monolib_qt_timer.o \
monolib_qt_toolbar.o \ monolib_qt_toolbar.o \
@ -7682,17 +7686,7 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_qt_toplevel.o \ monolib_qt_toplevel.o \
monolib_qt_uiaction.o \ monolib_qt_uiaction.o \
monolib_qt_utils.o \ monolib_qt_utils.o \
monolib_qt_window.o \ monolib_qt_window.o
monolib_taskbarcmn.o \
monolib_unix_joystick.o \
monolib_qt_taskbar.o \
monolib_dvrenderer.o \
monolib_animateg.o \
monolib_qt_dataview.o \
monolib_unix_sound.o \
monolib_generic_activityindicator.o \
monolib_qt_calctrl.o \
monolib_dvrenderers.o
@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1) @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_fontmgrcmn.o \ monolib_fontmgrcmn.o \
@ -9708,6 +9702,19 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 = \
coredll_animateg.o coredll_animateg.o
@COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2) @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_taskbarcmn.o \
coredll_generic_caret.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
coredll_generic_fdrepdlg.o \
coredll_filepickerg.o \
coredll_fontpickerg.o \
coredll_generic_icon.o \
coredll_generic_imaglist.o \
coredll_prntdlgg.o \
coredll_generic_textmeasure.o \
coredll_animateg.o \
coredll_generic_activityindicator.o \
coredll_qt_accel.o \ coredll_qt_accel.o \
coredll_qt_app.o \ coredll_qt_app.o \
coredll_qt_apptraits.o \ coredll_qt_apptraits.o \
@ -9716,14 +9723,12 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_qt_brush.o \ coredll_qt_brush.o \
coredll_qt_anybutton.o \ coredll_qt_anybutton.o \
coredll_qt_button.o \ coredll_qt_button.o \
coredll_generic_caret.o \ coredll_qt_calctrl.o \
coredll_qt_checkbox.o \ coredll_qt_checkbox.o \
coredll_qt_checklst.o \ coredll_qt_checklst.o \
coredll_qt_choice.o \ coredll_qt_choice.o \
coredll_qt_clipbrd.o \ coredll_qt_clipbrd.o \
coredll_qt_clrpicker.o \ coredll_qt_clrpicker.o \
coredll_clrpickerg.o \
coredll_collpaneg.o \
coredll_qt_colordlg.o \ coredll_qt_colordlg.o \
coredll_qt_colour.o \ coredll_qt_colour.o \
coredll_qt_combobox.o \ coredll_qt_combobox.o \
@ -9732,6 +9737,7 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_qt_ctrlsub.o \ coredll_qt_ctrlsub.o \
coredll_qt_cursor.o \ coredll_qt_cursor.o \
coredll_qt_dataobj.o \ coredll_qt_dataobj.o \
coredll_qt_dataview.o \
coredll_qt_dcclient.o \ coredll_qt_dcclient.o \
coredll_qt_dc.o \ coredll_qt_dc.o \
coredll_qt_dcmemory.o \ coredll_qt_dcmemory.o \
@ -9739,22 +9745,18 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_qt_dcscreen.o \ coredll_qt_dcscreen.o \
coredll_defs.o \ coredll_defs.o \
coredll_qt_dialog.o \ coredll_qt_dialog.o \
coredll_unix_dialup.o \
coredll_qt_display.o \ coredll_qt_display.o \
coredll_qt_dnd.o \ coredll_qt_dnd.o \
coredll_dvrenderer.o \
coredll_dvrenderers.o \
coredll_qt_evtloop.o \ coredll_qt_evtloop.o \
coredll_generic_fdrepdlg.o \
coredll_qt_filedlg.o \ coredll_qt_filedlg.o \
coredll_filepickerg.o \
coredll_qt_font.o \ coredll_qt_font.o \
coredll_qt_fontdlg.o \ coredll_qt_fontdlg.o \
coredll_qt_fontutil.o \ coredll_qt_fontutil.o \
coredll_qt_fontenum.o \ coredll_qt_fontenum.o \
coredll_fontpickerg.o \
coredll_qt_frame.o \ coredll_qt_frame.o \
coredll_qt_gauge.o \ coredll_qt_gauge.o \
coredll_generic_icon.o \
coredll_generic_imaglist.o \
coredll_qt_listbox.o \ coredll_qt_listbox.o \
coredll_qt_listctrl.o \ coredll_qt_listctrl.o \
coredll_qt_mdi.o \ coredll_qt_mdi.o \
@ -9768,7 +9770,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_qt_pen.o \ coredll_qt_pen.o \
coredll_qt_popupwin.o \ coredll_qt_popupwin.o \
coredll_qt_printdlg.o \ coredll_qt_printdlg.o \
coredll_prntdlgg.o \
coredll_printqt.o \ coredll_printqt.o \
coredll_qt_radiobox.o \ coredll_qt_radiobox.o \
coredll_qt_radiobut.o \ coredll_qt_radiobut.o \
@ -9784,9 +9785,9 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_qt_statline.o \ coredll_qt_statline.o \
coredll_qt_stattext.o \ coredll_qt_stattext.o \
coredll_qt_statusbar.o \ coredll_qt_statusbar.o \
coredll_qt_taskbar.o \
coredll_qt_textctrl.o \ coredll_qt_textctrl.o \
coredll_qt_textentry.o \ coredll_qt_textentry.o \
coredll_generic_textmeasure.o \
coredll_qt_tglbtn.o \ coredll_qt_tglbtn.o \
coredll_qt_timer.o \ coredll_qt_timer.o \
coredll_qt_toolbar.o \ coredll_qt_toolbar.o \
@ -9794,17 +9795,7 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_qt_toplevel.o \ coredll_qt_toplevel.o \
coredll_qt_uiaction.o \ coredll_qt_uiaction.o \
coredll_qt_utils.o \ coredll_qt_utils.o \
coredll_qt_window.o \ coredll_qt_window.o
coredll_taskbarcmn.o \
coredll_unix_joystick.o \
coredll_qt_taskbar.o \
coredll_dvrenderer.o \
coredll_animateg.o \
coredll_qt_dataview.o \
coredll_unix_sound.o \
coredll_generic_activityindicator.o \
coredll_qt_calctrl.o \
coredll_dvrenderers.o
@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2) @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_fontmgrcmn.o \ coredll_fontmgrcmn.o \
@ -11415,6 +11406,19 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 = \
corelib_animateg.o corelib_animateg.o
@COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3) @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_taskbarcmn.o \
corelib_generic_caret.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
corelib_generic_fdrepdlg.o \
corelib_filepickerg.o \
corelib_fontpickerg.o \
corelib_generic_icon.o \
corelib_generic_imaglist.o \
corelib_prntdlgg.o \
corelib_generic_textmeasure.o \
corelib_animateg.o \
corelib_generic_activityindicator.o \
corelib_qt_accel.o \ corelib_qt_accel.o \
corelib_qt_app.o \ corelib_qt_app.o \
corelib_qt_apptraits.o \ corelib_qt_apptraits.o \
@ -11423,14 +11427,12 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_qt_brush.o \ corelib_qt_brush.o \
corelib_qt_anybutton.o \ corelib_qt_anybutton.o \
corelib_qt_button.o \ corelib_qt_button.o \
corelib_generic_caret.o \ corelib_qt_calctrl.o \
corelib_qt_checkbox.o \ corelib_qt_checkbox.o \
corelib_qt_checklst.o \ corelib_qt_checklst.o \
corelib_qt_choice.o \ corelib_qt_choice.o \
corelib_qt_clipbrd.o \ corelib_qt_clipbrd.o \
corelib_qt_clrpicker.o \ corelib_qt_clrpicker.o \
corelib_clrpickerg.o \
corelib_collpaneg.o \
corelib_qt_colordlg.o \ corelib_qt_colordlg.o \
corelib_qt_colour.o \ corelib_qt_colour.o \
corelib_qt_combobox.o \ corelib_qt_combobox.o \
@ -11439,6 +11441,7 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_qt_ctrlsub.o \ corelib_qt_ctrlsub.o \
corelib_qt_cursor.o \ corelib_qt_cursor.o \
corelib_qt_dataobj.o \ corelib_qt_dataobj.o \
corelib_qt_dataview.o \
corelib_qt_dcclient.o \ corelib_qt_dcclient.o \
corelib_qt_dc.o \ corelib_qt_dc.o \
corelib_qt_dcmemory.o \ corelib_qt_dcmemory.o \
@ -11446,22 +11449,18 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_qt_dcscreen.o \ corelib_qt_dcscreen.o \
corelib_defs.o \ corelib_defs.o \
corelib_qt_dialog.o \ corelib_qt_dialog.o \
corelib_unix_dialup.o \
corelib_qt_display.o \ corelib_qt_display.o \
corelib_qt_dnd.o \ corelib_qt_dnd.o \
corelib_dvrenderer.o \
corelib_dvrenderers.o \
corelib_qt_evtloop.o \ corelib_qt_evtloop.o \
corelib_generic_fdrepdlg.o \
corelib_qt_filedlg.o \ corelib_qt_filedlg.o \
corelib_filepickerg.o \
corelib_qt_font.o \ corelib_qt_font.o \
corelib_qt_fontdlg.o \ corelib_qt_fontdlg.o \
corelib_qt_fontutil.o \ corelib_qt_fontutil.o \
corelib_qt_fontenum.o \ corelib_qt_fontenum.o \
corelib_fontpickerg.o \
corelib_qt_frame.o \ corelib_qt_frame.o \
corelib_qt_gauge.o \ corelib_qt_gauge.o \
corelib_generic_icon.o \
corelib_generic_imaglist.o \
corelib_qt_listbox.o \ corelib_qt_listbox.o \
corelib_qt_listctrl.o \ corelib_qt_listctrl.o \
corelib_qt_mdi.o \ corelib_qt_mdi.o \
@ -11475,7 +11474,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_qt_pen.o \ corelib_qt_pen.o \
corelib_qt_popupwin.o \ corelib_qt_popupwin.o \
corelib_qt_printdlg.o \ corelib_qt_printdlg.o \
corelib_prntdlgg.o \
corelib_printqt.o \ corelib_printqt.o \
corelib_qt_radiobox.o \ corelib_qt_radiobox.o \
corelib_qt_radiobut.o \ corelib_qt_radiobut.o \
@ -11491,9 +11489,9 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_qt_statline.o \ corelib_qt_statline.o \
corelib_qt_stattext.o \ corelib_qt_stattext.o \
corelib_qt_statusbar.o \ corelib_qt_statusbar.o \
corelib_qt_taskbar.o \
corelib_qt_textctrl.o \ corelib_qt_textctrl.o \
corelib_qt_textentry.o \ corelib_qt_textentry.o \
corelib_generic_textmeasure.o \
corelib_qt_tglbtn.o \ corelib_qt_tglbtn.o \
corelib_qt_timer.o \ corelib_qt_timer.o \
corelib_qt_toolbar.o \ corelib_qt_toolbar.o \
@ -11501,17 +11499,7 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_qt_toplevel.o \ corelib_qt_toplevel.o \
corelib_qt_uiaction.o \ corelib_qt_uiaction.o \
corelib_qt_utils.o \ corelib_qt_utils.o \
corelib_qt_window.o \ corelib_qt_window.o
corelib_taskbarcmn.o \
corelib_unix_joystick.o \
corelib_qt_taskbar.o \
corelib_dvrenderer.o \
corelib_animateg.o \
corelib_qt_dataview.o \
corelib_unix_sound.o \
corelib_generic_activityindicator.o \
corelib_qt_calctrl.o \
corelib_dvrenderers.o
@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3) @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_fontmgrcmn.o \ corelib_fontmgrcmn.o \
@ -16538,6 +16526,9 @@ monodll_qt_anybutton.o: $(srcdir)/src/qt/anybutton.cpp $(MONODLL_ODEP)
monodll_qt_button.o: $(srcdir)/src/qt/button.cpp $(MONODLL_ODEP) monodll_qt_button.o: $(srcdir)/src/qt/button.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/button.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/button.cpp
monodll_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
monodll_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(MONODLL_ODEP) monodll_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp
@ -16577,6 +16568,9 @@ monodll_qt_cursor.o: $(srcdir)/src/qt/cursor.cpp $(MONODLL_ODEP)
monodll_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(MONODLL_ODEP) monodll_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp
monodll_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
monodll_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(MONODLL_ODEP) monodll_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp
@ -16604,6 +16598,12 @@ monodll_qt_display.o: $(srcdir)/src/qt/display.cpp $(MONODLL_ODEP)
monodll_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(MONODLL_ODEP) monodll_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp
monodll_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
monodll_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
monodll_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(MONODLL_ODEP) monodll_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp
@ -16712,6 +16712,9 @@ monodll_qt_stattext.o: $(srcdir)/src/qt/stattext.cpp $(MONODLL_ODEP)
monodll_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(MONODLL_ODEP) monodll_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp
monodll_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
monodll_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(MONODLL_ODEP) monodll_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp
@ -16742,21 +16745,6 @@ monodll_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(MONODLL_ODEP)
monodll_qt_window.o: $(srcdir)/src/qt/window.cpp $(MONODLL_ODEP) monodll_qt_window.o: $(srcdir)/src/qt/window.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/window.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/window.cpp
monodll_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
monodll_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
monodll_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
monodll_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
monodll_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
monodll_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(MONODLL_ODEP) monodll_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@ -17546,9 +17534,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@ -17729,9 +17714,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@ -17804,9 +17786,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@ -21785,6 +21764,9 @@ monolib_qt_anybutton.o: $(srcdir)/src/qt/anybutton.cpp $(MONOLIB_ODEP)
monolib_qt_button.o: $(srcdir)/src/qt/button.cpp $(MONOLIB_ODEP) monolib_qt_button.o: $(srcdir)/src/qt/button.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/button.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/button.cpp
monolib_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
monolib_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(MONOLIB_ODEP) monolib_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp
@ -21824,6 +21806,9 @@ monolib_qt_cursor.o: $(srcdir)/src/qt/cursor.cpp $(MONOLIB_ODEP)
monolib_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(MONOLIB_ODEP) monolib_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp
monolib_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
monolib_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(MONOLIB_ODEP) monolib_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp
@ -21851,6 +21836,12 @@ monolib_qt_display.o: $(srcdir)/src/qt/display.cpp $(MONOLIB_ODEP)
monolib_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(MONOLIB_ODEP) monolib_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp
monolib_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
monolib_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
monolib_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(MONOLIB_ODEP) monolib_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp
@ -21959,6 +21950,9 @@ monolib_qt_stattext.o: $(srcdir)/src/qt/stattext.cpp $(MONOLIB_ODEP)
monolib_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(MONOLIB_ODEP) monolib_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp
monolib_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
monolib_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(MONOLIB_ODEP) monolib_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp
@ -21989,21 +21983,6 @@ monolib_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(MONOLIB_ODEP)
monolib_qt_window.o: $(srcdir)/src/qt/window.cpp $(MONOLIB_ODEP) monolib_qt_window.o: $(srcdir)/src/qt/window.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/window.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/window.cpp
monolib_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
monolib_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
monolib_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
monolib_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
monolib_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
monolib_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(MONOLIB_ODEP) monolib_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@ -22793,9 +22772,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@ -22976,9 +22952,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@ -23051,9 +23024,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@ -27698,6 +27668,9 @@ coredll_qt_anybutton.o: $(srcdir)/src/qt/anybutton.cpp $(COREDLL_ODEP)
coredll_qt_button.o: $(srcdir)/src/qt/button.cpp $(COREDLL_ODEP) coredll_qt_button.o: $(srcdir)/src/qt/button.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/button.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/button.cpp
coredll_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
coredll_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(COREDLL_ODEP) coredll_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp
@ -27737,6 +27710,9 @@ coredll_qt_cursor.o: $(srcdir)/src/qt/cursor.cpp $(COREDLL_ODEP)
coredll_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(COREDLL_ODEP) coredll_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp
coredll_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
coredll_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(COREDLL_ODEP) coredll_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp
@ -27764,6 +27740,12 @@ coredll_qt_display.o: $(srcdir)/src/qt/display.cpp $(COREDLL_ODEP)
coredll_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(COREDLL_ODEP) coredll_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp
coredll_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
coredll_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
coredll_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(COREDLL_ODEP) coredll_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp
@ -27872,6 +27854,9 @@ coredll_qt_stattext.o: $(srcdir)/src/qt/stattext.cpp $(COREDLL_ODEP)
coredll_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(COREDLL_ODEP) coredll_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp
coredll_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
coredll_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(COREDLL_ODEP) coredll_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp
@ -27902,21 +27887,6 @@ coredll_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(COREDLL_ODEP)
coredll_qt_window.o: $(srcdir)/src/qt/window.cpp $(COREDLL_ODEP) coredll_qt_window.o: $(srcdir)/src/qt/window.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/window.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/window.cpp
coredll_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
coredll_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
coredll_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
coredll_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
coredll_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
coredll_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(COREDLL_ODEP) coredll_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@ -28133,9 +28103,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@ -28316,9 +28283,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(COREDLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(COREDLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@ -28391,9 +28355,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(COREDLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(COREDLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@ -31940,6 +31901,9 @@ corelib_qt_anybutton.o: $(srcdir)/src/qt/anybutton.cpp $(CORELIB_ODEP)
corelib_qt_button.o: $(srcdir)/src/qt/button.cpp $(CORELIB_ODEP) corelib_qt_button.o: $(srcdir)/src/qt/button.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/button.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/button.cpp
corelib_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
corelib_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(CORELIB_ODEP) corelib_qt_checkbox.o: $(srcdir)/src/qt/checkbox.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/checkbox.cpp
@ -31979,6 +31943,9 @@ corelib_qt_cursor.o: $(srcdir)/src/qt/cursor.cpp $(CORELIB_ODEP)
corelib_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(CORELIB_ODEP) corelib_qt_dataobj.o: $(srcdir)/src/qt/dataobj.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dataobj.cpp
corelib_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
corelib_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(CORELIB_ODEP) corelib_qt_dcclient.o: $(srcdir)/src/qt/dcclient.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dcclient.cpp
@ -32006,6 +31973,12 @@ corelib_qt_display.o: $(srcdir)/src/qt/display.cpp $(CORELIB_ODEP)
corelib_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(CORELIB_ODEP) corelib_qt_dnd.o: $(srcdir)/src/qt/dnd.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dnd.cpp
corelib_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
corelib_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
corelib_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(CORELIB_ODEP) corelib_qt_evtloop.o: $(srcdir)/src/qt/evtloop.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/evtloop.cpp
@ -32114,6 +32087,9 @@ corelib_qt_stattext.o: $(srcdir)/src/qt/stattext.cpp $(CORELIB_ODEP)
corelib_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(CORELIB_ODEP) corelib_qt_statusbar.o: $(srcdir)/src/qt/statusbar.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/statusbar.cpp
corelib_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
corelib_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(CORELIB_ODEP) corelib_qt_textctrl.o: $(srcdir)/src/qt/textctrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/textctrl.cpp
@ -32144,21 +32120,6 @@ corelib_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(CORELIB_ODEP)
corelib_qt_window.o: $(srcdir)/src/qt/window.cpp $(CORELIB_ODEP) corelib_qt_window.o: $(srcdir)/src/qt/window.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/window.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/window.cpp
corelib_qt_taskbar.o: $(srcdir)/src/qt/taskbar.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/taskbar.cpp
corelib_dvrenderer.o: $(srcdir)/src/qt/dvrenderer.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderer.cpp
corelib_qt_dataview.o: $(srcdir)/src/qt/dataview.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dataview.cpp
corelib_qt_calctrl.o: $(srcdir)/src/qt/calctrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/calctrl.cpp
corelib_dvrenderers.o: $(srcdir)/src/qt/dvrenderers.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/dvrenderers.cpp
corelib_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(CORELIB_ODEP) corelib_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@ -32375,9 +32336,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@ -32558,9 +32516,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(CORELIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(CORELIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@ -32633,9 +32588,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(CORELIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(CORELIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp

6
autoconf_inc.m4
View file

@ -818,12 +818,6 @@ dnl ### begin block 20_COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
fi fi
AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0) AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_Qt[wx.bkl] ###
COND_TOOLKIT_Qt="#"
if test "x$TOOLKIT" = "xQt" ; then
COND_TOOLKIT_Qt=""
fi
AC_SUBST(COND_TOOLKIT_Qt)
dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ### dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ###
COND_TOOLKIT_X11="#" COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then if test "x$TOOLKIT" = "xX11" ; then

4
build/aclocal/bakefile.m4
View file

@ -76,7 +76,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
case "${BAKEFILE_HOST}" in case "${BAKEFILE_HOST}" in
*-*-mingw32* ) *-*-mingw* )
PLATFORM_WIN32=1 PLATFORM_WIN32=1
;; ;;
*-*-darwin* ) *-*-darwin* )
@ -197,7 +197,7 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
DLLPREFIX="cyg" DLLPREFIX="cyg"
dlldir="$bindir" dlldir="$bindir"
;; ;;
*-*-mingw32* ) *-*-mingw* )
SO_SUFFIX="dll" SO_SUFFIX="dll"
SO_SUFFIX_MODULE="dll" SO_SUFFIX_MODULE="dll"
DLLIMP_SUFFIX="dll.a" DLLIMP_SUFFIX="dll.a"

42
build/bakefiles/files.bkl
View file

@ -339,6 +339,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set> </set>
<set var="QT_SRC" hints="files"> <set var="QT_SRC" hints="files">
src/common/taskbarcmn.cpp
src/generic/caret.cpp
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
src/generic/fdrepdlg.cpp
src/generic/filepickerg.cpp
src/generic/fontpickerg.cpp
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/prntdlgg.cpp
src/generic/textmeasure.cpp
src/generic/animateg.cpp
src/generic/activityindicator.cpp
src/qt/accel.cpp src/qt/accel.cpp
src/qt/app.cpp src/qt/app.cpp
src/qt/apptraits.cpp src/qt/apptraits.cpp
@ -347,14 +360,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/brush.cpp src/qt/brush.cpp
src/qt/anybutton.cpp src/qt/anybutton.cpp
src/qt/button.cpp src/qt/button.cpp
src/generic/caret.cpp src/qt/calctrl.cpp
src/qt/checkbox.cpp src/qt/checkbox.cpp
src/qt/checklst.cpp src/qt/checklst.cpp
src/qt/choice.cpp src/qt/choice.cpp
src/qt/clipbrd.cpp src/qt/clipbrd.cpp
src/qt/clrpicker.cpp src/qt/clrpicker.cpp
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
src/qt/colordlg.cpp src/qt/colordlg.cpp
src/qt/colour.cpp src/qt/colour.cpp
src/qt/combobox.cpp src/qt/combobox.cpp
@ -363,6 +374,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/ctrlsub.cpp src/qt/ctrlsub.cpp
src/qt/cursor.cpp src/qt/cursor.cpp
src/qt/dataobj.cpp src/qt/dataobj.cpp
src/qt/dataview.cpp
src/qt/dcclient.cpp src/qt/dcclient.cpp
src/qt/dc.cpp src/qt/dc.cpp
src/qt/dcmemory.cpp src/qt/dcmemory.cpp
@ -370,22 +382,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/dcscreen.cpp src/qt/dcscreen.cpp
src/qt/defs.cpp src/qt/defs.cpp
src/qt/dialog.cpp src/qt/dialog.cpp
src/unix/dialup.cpp
src/qt/display.cpp src/qt/display.cpp
src/qt/dnd.cpp src/qt/dnd.cpp
src/qt/dvrenderer.cpp
src/qt/dvrenderers.cpp
src/qt/evtloop.cpp src/qt/evtloop.cpp
src/generic/fdrepdlg.cpp
src/qt/filedlg.cpp src/qt/filedlg.cpp
src/generic/filepickerg.cpp
src/qt/font.cpp src/qt/font.cpp
src/qt/fontdlg.cpp src/qt/fontdlg.cpp
src/qt/fontutil.cpp src/qt/fontutil.cpp
src/qt/fontenum.cpp src/qt/fontenum.cpp
src/generic/fontpickerg.cpp
src/qt/frame.cpp src/qt/frame.cpp
src/qt/gauge.cpp src/qt/gauge.cpp
src/generic/icon.cpp
src/generic/imaglist.cpp
src/qt/listbox.cpp src/qt/listbox.cpp
src/qt/listctrl.cpp src/qt/listctrl.cpp
src/qt/mdi.cpp src/qt/mdi.cpp
@ -399,7 +407,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/pen.cpp src/qt/pen.cpp
src/qt/popupwin.cpp src/qt/popupwin.cpp
src/qt/printdlg.cpp src/qt/printdlg.cpp
src/generic/prntdlgg.cpp
src/qt/printqt.cpp src/qt/printqt.cpp
src/qt/radiobox.cpp src/qt/radiobox.cpp
src/qt/radiobut.cpp src/qt/radiobut.cpp
@ -415,28 +422,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/statline.cpp src/qt/statline.cpp
src/qt/stattext.cpp src/qt/stattext.cpp
src/qt/statusbar.cpp src/qt/statusbar.cpp
src/qt/taskbar.cpp
src/qt/textctrl.cpp src/qt/textctrl.cpp
src/qt/textentry.cpp src/qt/textentry.cpp
src/generic/textmeasure.cpp
src/qt/tglbtn.cpp src/qt/tglbtn.cpp
src/qt/timer.cpp src/qt/timer.cpp
src/qt/toolbar.cpp src/qt/toolbar.cpp
src/qt/tooltip.cpp src/qt/tooltip.cpp
src/qt/toplevel.cpp src/qt/toplevel.cpp
<!-- src/qt/treectrl.cpp -->
src/qt/uiaction.cpp src/qt/uiaction.cpp
src/qt/utils.cpp src/qt/utils.cpp
src/qt/window.cpp src/qt/window.cpp
src/common/taskbarcmn.cpp
src/unix/joystick.cpp
src/qt/taskbar.cpp
src/qt/dvrenderer.cpp
src/generic/animateg.cpp
src/qt/dataview.cpp
src/unix/sound.cpp
src/generic/activityindicator.cpp
src/qt/calctrl.cpp
src/qt/dvrenderers.cpp
</set> </set>
<set var="MEDIA_QT_SRC" hints="files"> <set var="MEDIA_QT_SRC" hints="files">
@ -3251,7 +3247,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk1/glcanvas.h wx/gtk1/glcanvas.h
wx/unix/glx11.h wx/unix/glx11.h
</if> </if>
<if cond="TOOLKIT=='Qt'">wx/qt/glcanvas.h</if> <if cond="TOOLKIT=='QT'">wx/qt/glcanvas.h</if>
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if> <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if> <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
<if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if> <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>

3
build/cmake/files.cmake
View file

@ -292,7 +292,6 @@ set(QT_SRC
src/qt/dcscreen.cpp src/qt/dcscreen.cpp
src/qt/defs.cpp src/qt/defs.cpp
src/qt/dialog.cpp src/qt/dialog.cpp
src/unix/dialup.cpp
src/qt/display.cpp src/qt/display.cpp
src/qt/dnd.cpp src/qt/dnd.cpp
src/qt/evtloop.cpp src/qt/evtloop.cpp
@ -353,9 +352,7 @@ set(QT_SRC
src/generic/activityindicator.cpp src/generic/activityindicator.cpp
src/common/taskbarcmn.cpp src/common/taskbarcmn.cpp
src/generic/animateg.cpp src/generic/animateg.cpp
src/unix/sound.cpp
src/qt/calctrl.cpp src/qt/calctrl.cpp
src/unix/joystick.cpp
src/qt/dataview.cpp src/qt/dataview.cpp
src/qt/taskbar.cpp src/qt/taskbar.cpp
) )

4
build/files
View file

@ -378,11 +378,7 @@ QT_SRC=
src/qt/toplevel.cpp src/qt/toplevel.cpp
src/qt/uiaction.cpp src/qt/uiaction.cpp
src/qt/utils.cpp src/qt/utils.cpp
src/qt/utils.cpp
src/qt/window.cpp src/qt/window.cpp
src/unix/dialup.cpp
src/unix/joystick.cpp
src/unix/sound.cpp
MEDIA_QT_SRC= MEDIA_QT_SRC=
src/qt/mediactrl.cpp src/qt/mediactrl.cpp

18
configure vendored
View file

@ -698,7 +698,6 @@ COND_UNICODE_1
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1
COND_TOOLKIT_X11 COND_TOOLKIT_X11
COND_TOOLKIT_Qt
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_QT COND_TOOLKIT_QT
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
@ -3770,7 +3769,7 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
wx_top_builddir="`pwd`" wx_top_builddir="`pwd -W 2> /dev/null || pwd`"
@ -23728,7 +23727,7 @@ fi
LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32" LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32"
case "${host}" in case "${host}" in
x86_64-*-mingw32* ) x86_64-*-mingw* )
WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
;; ;;
esac esac
@ -23761,7 +23760,7 @@ if test "$wxUSE_GUI" = "yes"; then
GUIDIST=MSW_DIST GUIDIST=MSW_DIST
case "${host}" in case "${host}" in
*-*-mingw32* ) *-*-mingw* )
WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows"
esac esac
fi fi
@ -33215,7 +33214,7 @@ $as_echo "$wx_cv_type_abi_forced_unwind" >&6; }
else else
if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_THREADS" = "yes" ; then
case "${host}" in case "${host}" in
x86_64-*-mingw32* ) x86_64-*-mingw* )
;; ;;
*-*-mingw32* ) *-*-mingw32* )
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5
@ -39792,7 +39791,7 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
case "${BAKEFILE_HOST}" in case "${BAKEFILE_HOST}" in
*-*-mingw32* ) *-*-mingw* )
PLATFORM_WIN32=1 PLATFORM_WIN32=1
;; ;;
*-*-darwin* ) *-*-darwin* )
@ -39886,7 +39885,7 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
DLLPREFIX="cyg" DLLPREFIX="cyg"
dlldir="$bindir" dlldir="$bindir"
;; ;;
*-*-mingw32* ) *-*-mingw* )
SO_SUFFIX="dll" SO_SUFFIX="dll"
SO_SUFFIX_MODULE="dll" SO_SUFFIX_MODULE="dll"
DLLIMP_SUFFIX="dll.a" DLLIMP_SUFFIX="dll.a"
@ -41368,11 +41367,6 @@ EOF
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
fi fi
COND_TOOLKIT_Qt="#"
if test "x$TOOLKIT" = "xQt" ; then
COND_TOOLKIT_Qt=""
fi
COND_TOOLKIT_X11="#" COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKIT_X11="" COND_TOOLKIT_X11=""

8
configure.in
View file

@ -52,7 +52,7 @@ WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_numbe
dnl Autoconf-2.60 changed the meaning of top_builddir variable, so we have dnl Autoconf-2.60 changed the meaning of top_builddir variable, so we have
dnl to use our own replacement that will work with both 2.5x and 2.60+: dnl to use our own replacement that will work with both 2.5x and 2.60+:
wx_top_builddir="`pwd`" wx_top_builddir="`pwd -W 2> /dev/null || pwd`"
AC_SUBST(wx_top_builddir) AC_SUBST(wx_top_builddir)
@ -2746,7 +2746,7 @@ if test "$USE_WIN32" = 1 ; then
LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32" LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32"
case "${host}" in case "${host}" in
x86_64-*-mingw32* ) x86_64-*-mingw* )
dnl we need to define this to embed the manifest for correct dnl we need to define this to embed the manifest for correct
dnl platform from wx/msw/wx.rc (this is not needed for x86 which is dnl platform from wx/msw/wx.rc (this is not needed for x86 which is
dnl the default in wx/msw/rcdefs.h) dnl the default in wx/msw/rcdefs.h)
@ -2785,7 +2785,7 @@ if test "$wxUSE_GUI" = "yes"; then
dnl -mwindows causes a heap of other default gui libs to be linked in. dnl -mwindows causes a heap of other default gui libs to be linked in.
case "${host}" in case "${host}" in
*-*-mingw32* ) *-*-mingw* )
WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows"
esac esac
fi fi
@ -5003,7 +5003,7 @@ dnl from if !MSW
else else
if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_THREADS" = "yes" ; then
case "${host}" in case "${host}" in
x86_64-*-mingw32* ) x86_64-*-mingw* )
;; ;;
*-*-mingw32* ) *-*-mingw32* )
dnl check if the compiler accepts -mthreads dnl check if the compiler accepts -mthreads

3
docs/qt/install.txt
View file

@ -104,7 +104,8 @@ to configure the Qt dir of the build intended to use as QT5_CUSTOM_DIR, i.e.
../configure --with-qt --enable-debug QT5_CUSTOM_DIR=~/Qt/5.11.0/gcc_64 ../configure --with-qt --enable-debug QT5_CUSTOM_DIR=~/Qt/5.11.0/gcc_64
# for Windows (ran from Git Bash, or any other Unix-like shell): # for Windows (ran from Git Bash, or any other Unix-like shell):
../configure --with-qt --enable-debug QT5_CUSTOM_DIR=/c/Qt/5.11.0/mingw53_32 # (the syntax for the drive in the path is required by ar and ld)
../configure --with-qt --enable-debug QT5_CUSTOM_DIR=c:/Qt/5.11.0/mingw53_32
* Building wxGT on Android * Building wxGT on Android
-------------------------- --------------------------

2
include/wx/evtloop.h
View file

@ -296,7 +296,7 @@ private:
#include "wx/dfb/evtloop.h" #include "wx/dfb/evtloop.h"
#elif defined(__WXGTK20__) #elif defined(__WXGTK20__)
#include "wx/gtk/evtloop.h" #include "wx/gtk/evtloop.h"
#elif defined(__WXQT__) #elif defined(__WXQT__)
#include "wx/qt/evtloop.h" #include "wx/qt/evtloop.h"
#else // other platform #else // other platform

25
include/wx/msw/apptrait.h
View file

@ -87,6 +87,31 @@ public:
virtual bool WriteToStderr(const wxString& WXUNUSED(text)) { return false; } virtual bool WriteToStderr(const wxString& WXUNUSED(text)) { return false; }
}; };
#elif defined(__WXQT__)
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
{
public:
virtual wxEventLoopBase *CreateEventLoop();
virtual void *BeforeChildWaitLoop() { return NULL; }
virtual void AfterChildWaitLoop(void*) { }
#if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif
#if wxUSE_THREADS
virtual bool DoMessageFromThreadWait() { return true; }
virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
{ return DoSimpleWaitForThread(hThread); }
#endif // wxUSE_THREADS
virtual wxPortId GetToolkitVersion(int *majVer = NULL,
int *minVer = NULL,
int *microVer = NULL) const;
virtual bool CanUseStderr() { return false; }
virtual bool WriteToStderr(const wxString&) { return false; }
};
#endif #endif
#endif // wxUSE_GUI #endif // wxUSE_GUI

6
include/wx/platform.h
View file

@ -81,7 +81,7 @@
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
/* Select wxMSW under Windows if no other port is specified. */ /* Select wxMSW under Windows if no other port is specified. */
# if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) # if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) && !defined(__WXQT__)
# define __WXMSW__ # define __WXMSW__
# endif # endif
@ -122,13 +122,13 @@
# endif # endif
#endif #endif
#if defined(__WXGTK__) && defined(__WINDOWS__) #if (defined(__WXGTK__) || defined(__WXQT__)) && defined(__WINDOWS__)
# ifdef __WXMSW__ # ifdef __WXMSW__
# undef __WXMSW__ # undef __WXMSW__
# endif # endif
#endif /* __WXGTK__ && __WINDOWS__ */ #endif /* (__WXGTK__ || __WXQT__) && __WINDOWS__ */
#ifdef __ANDROID__ #ifdef __ANDROID__
# define __WXANDROID__ # define __WXANDROID__

2
include/wx/qt/taskbar.h
View file

@ -10,7 +10,7 @@
class QSystemTrayIcon; class QSystemTrayIcon;
class WXDLLIMPEXP_CORE wxTaskBarIcon : public wxTaskBarIconBase class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
{ {
public: public:
wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE); wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);

28
include/wx/systhemectrl.h
View file

@ -12,6 +12,10 @@
#include "wx/defs.h" #include "wx/defs.h"
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
#define wxHAS_SYSTEM_THEMED_CONTROL
#endif
class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_CORE wxSystemThemedControlBase class WXDLLIMPEXP_CORE wxSystemThemedControlBase
@ -24,7 +28,13 @@ public:
protected: protected:
// This method is virtual and can be overridden, e.g. composite controls do // This method is virtual and can be overridden, e.g. composite controls do
// it to enable the system theme for all of their parts. // it to enable the system theme for all of their parts.
virtual void DoEnableSystemTheme(bool enable, wxWindow* window); virtual void DoEnableSystemTheme
#ifdef wxHAS_SYSTEM_THEMED_CONTROL
// Only __WXMSW__ has a non-trivial implementation currently.
(bool enable, wxWindow* window);
#else
(bool WXUNUSED(enable), wxWindow* WXUNUSED(window)) { }
#endif // wxHAS_SYSTEM_THEMED_CONTROL
wxDECLARE_NO_COPY_CLASS(wxSystemThemedControlBase); wxDECLARE_NO_COPY_CLASS(wxSystemThemedControlBase);
}; };
@ -47,20 +57,4 @@ protected:
wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxSystemThemedControl, C); wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxSystemThemedControl, C);
}; };
// Only __WXMSW__ has a non-trivial implementation currently.
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
#define wxHAS_SYSTEM_THEMED_CONTROL
#endif
#ifndef wxHAS_SYSTEM_THEMED_CONTROL
inline void
wxSystemThemedControlBase::DoEnableSystemTheme(bool WXUNUSED(enable),
wxWindow* WXUNUSED(window))
{
// Nothing to do.
}
#endif // !wxHAS_SYSTEM_THEMED_CONTROL
#endif // _WX_SYSTHEMECTRL_H #endif // _WX_SYSTHEMECTRL_H

3
src/common/image.cpp
View file

@ -2481,7 +2481,8 @@ int wxImage::GetLoadFlags() const
// Under Windows we can load wxImage not only from files but also from // Under Windows we can load wxImage not only from files but also from
// resources. // resources.
#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE #if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE \
&& !defined(__WXQT__) // undefined reference to `wxDIB::ConvertToImage(wxDIB::ConversionFlags) const'
#define HAS_LOAD_FROM_RESOURCE #define HAS_LOAD_FROM_RESOURCE
#endif #endif

2
src/common/utilscmn.cpp
View file

@ -1037,7 +1037,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
// Launch default browser // Launch default browser
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__WINDOWS__) || \ #if defined(__WINDOWS__) && !defined(__WXQT__) || \
defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__) || \ defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__) || \
defined(__WXOSX__) defined(__WXOSX__)

1
src/msw/basemsw.cpp
View file

@ -86,6 +86,7 @@ wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
#endif // wxUSE_TIMER #endif // wxUSE_TIMER
// Why can't this be disabled for __WXQT__ ??? There is an implementation in src/qt/apptraits.cpp
wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
{ {
#if wxUSE_CONSOLE_EVENTLOOP #if wxUSE_CONSOLE_EVENTLOOP

3
src/qt/apptraits.cpp
View file

@ -56,7 +56,8 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer,
//############################################################################# //#############################################################################
#if wxUSE_CONSOLE_EVENTLOOP // this one fails to link under Windows; why is src/msw/basemsw.cpp picked up???
#if wxUSE_CONSOLE_EVENTLOOP && !defined(__WINDOWS__)
wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
{ {

4
src/qt/sockqt.cpp
View file

@ -94,10 +94,12 @@ public:
wxVector<wxQtFDIONotifier*> m_qtNotifiers; wxVector<wxQtFDIONotifier*> m_qtNotifiers;
}; };
#if defined(__UNIX__)
wxFDIOManager *wxGUIAppTraits::GetFDIOManager() wxFDIOManager *wxGUIAppTraits::GetFDIOManager()
{ {
static QtFDIOManager s_manager; static QtFDIOManager s_manager;
return &s_manager; return &s_manager;
} }
#endif // __UNIX__
#endif // wxUSE_SOCKETS && __UNIX__ #endif // wxUSE_SOCKETS

2
src/qt/taskbar.cpp
View file

@ -21,7 +21,7 @@ bool wxTaskBarIconBase::IsAvailable()
//============================================================================= //=============================================================================
wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxTaskBarIconBase); wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler);
wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType)) wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
{ {