From 959b67778666406ca867854d27646cca31a20b7c Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 25 Sep 2018 21:17:29 +0200 Subject: [PATCH 01/13] Remove non-existing WXQT headers from build system --- Makefile.in | 7 ------- build/bakefiles/files.bkl | 7 ------- build/cmake/files.cmake | 7 ------- build/files | 8 -------- 4 files changed, 29 deletions(-) diff --git a/Makefile.in b/Makefile.in index 342a4d4a29..8eb734fbd4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3479,8 +3479,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \ COND_TOOLKIT_QT_GUI_HDR = \ wx/qt/accel.h \ wx/qt/app.h \ - wx/qt/apptbase.h \ - wx/qt/apptrait.h \ wx/qt/bitmap.h \ wx/qt/bmpbuttn.h \ wx/qt/brush.h \ @@ -3496,7 +3494,6 @@ COND_TOOLKIT_QT_GUI_HDR = \ wx/qt/colour.h \ wx/qt/combobox.h \ wx/qt/control.h \ - wx/qt/converter.h \ wx/qt/ctrlsub.h \ wx/qt/cursor.h \ wx/qt/dataform.h \ @@ -3547,16 +3544,12 @@ COND_TOOLKIT_QT_GUI_HDR = \ wx/qt/statusbar.h \ wx/qt/stattext.h \ wx/qt/textctrl.h \ - wx/qt/textdlg.h \ wx/qt/textentry.h \ wx/qt/tglbtn.h \ - wx/qt/timer.h \ wx/qt/toolbar.h \ wx/qt/tooltip.h \ wx/qt/toplevel.h \ - wx/qt/utils.h \ wx/qt/window.h \ - wx/qt/private/winevent.h \ wx/generic/fdrepdlg.h \ wx/generic/filepickerg.h \ wx/generic/clrpickerg.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 27339536a8..e501061a11 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -245,8 +245,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/qt/accel.h wx/qt/app.h - wx/qt/apptbase.h - wx/qt/apptrait.h wx/qt/bitmap.h wx/qt/bmpbuttn.h wx/qt/brush.h @@ -262,7 +260,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/qt/colour.h wx/qt/combobox.h wx/qt/control.h - wx/qt/converter.h wx/qt/ctrlsub.h wx/qt/cursor.h wx/qt/dataform.h @@ -313,17 +310,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/qt/statusbar.h wx/qt/stattext.h wx/qt/textctrl.h - wx/qt/textdlg.h wx/qt/textentry.h wx/qt/tglbtn.h - wx/qt/timer.h wx/qt/toolbar.h wx/qt/tooltip.h wx/qt/toplevel.h - wx/qt/utils.h wx/qt/window.h - wx/qt/private/winevent.h wx/generic/fdrepdlg.h wx/generic/filepickerg.h wx/generic/clrpickerg.h diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index 7749731579..f0812e7474 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -168,8 +168,6 @@ set(BASE_OSX_NOTWXMAC_HDR set(QT_HDR wx/qt/accel.h wx/qt/app.h - wx/qt/apptbase.h - wx/qt/apptrait.h wx/qt/bitmap.h wx/qt/bmpbuttn.h wx/qt/brush.h @@ -187,7 +185,6 @@ set(QT_HDR wx/qt/colour.h wx/qt/combobox.h wx/qt/control.h - wx/qt/converter.h wx/qt/ctrlsub.h wx/qt/cursor.h wx/qt/dataform.h @@ -241,16 +238,12 @@ set(QT_HDR wx/qt/statusbar.h wx/qt/stattext.h wx/qt/textctrl.h - wx/qt/textdlg.h wx/qt/textentry.h wx/qt/tglbtn.h - wx/qt/timer.h wx/qt/toolbar.h wx/qt/tooltip.h wx/qt/toplevel.h - wx/qt/utils.h wx/qt/window.h - wx/qt/private/winevent.h wx/qt/dvrenderer.h wx/qt/dvrenderers.h wx/generic/animate.h diff --git a/build/files b/build/files index ef98625be1..7c3b433047 100644 --- a/build/files +++ b/build/files @@ -204,8 +204,6 @@ QT_HDR = wx/qt/accel.h wx/qt/anybutton.h wx/qt/app.h - wx/qt/apptbase.h - wx/qt/apptrait.h wx/qt/bitmap.h wx/qt/bmpbuttn.h wx/qt/brush.h @@ -220,7 +218,6 @@ QT_HDR = wx/qt/colour.h wx/qt/combobox.h wx/qt/control.h - wx/qt/converter.h wx/qt/ctrlsub.h wx/qt/cursor.h wx/qt/dataform.h @@ -258,7 +255,6 @@ QT_HDR = wx/qt/popupwin.h wx/qt/printdlg.h wx/qt/printqt.h - wx/qt/private/winevent.h wx/qt/radiobox.h wx/qt/radiobut.h wx/qt/region.h @@ -273,14 +269,11 @@ QT_HDR = wx/qt/statusbar.h wx/qt/taskbar.h wx/qt/textctrl.h - wx/qt/textdlg.h wx/qt/textentry.h wx/qt/tglbtn.h - wx/qt/timer.h wx/qt/toolbar.h wx/qt/tooltip.h wx/qt/toplevel.h - wx/qt/utils.h wx/qt/window.h QT_SRC= @@ -316,7 +309,6 @@ QT_SRC= src/qt/combobox.cpp src/qt/control.cpp src/qt/converter.cpp - src/qt/converter.cpp src/qt/ctrlsub.cpp src/qt/cursor.cpp src/qt/dataobj.cpp From 40d57a33deae90e0ebc6ad03eeeed824eaf175ee Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 30 Sep 2018 14:55:43 +0200 Subject: [PATCH 02/13] Remove remnants of OS/2 from build system --- autoconf_inc.m4 | 6 ------ configure | 6 ------ samples/dialogs/Makefile.in | 8 -------- 3 files changed, 20 deletions(-) diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index f3156ae24a..8367cfdd6d 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -530,12 +530,6 @@ dnl ### begin block 20_COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0[../../samples/dialogs/ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="" fi AC_SUBST(COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0) -dnl ### begin block 20_COND_SHARED_0_TOOLKIT_PM_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ### - COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#" - if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then - COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="" - fi - AC_SUBST(COND_SHARED_0_TOOLKIT_PM_WXUNIV_0) dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1[wx.bkl] ### COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then diff --git a/configure b/configure index 47205af945..2cb0841699 100755 --- a/configure +++ b/configure @@ -745,7 +745,6 @@ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 -COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0 @@ -41107,11 +41106,6 @@ EOF COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="" fi - COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#" - if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then - COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="" - fi - COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 83eea46a3c..f9e618bff3 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -106,8 +106,6 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \ @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@ dialogs_filedlgg.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = dialogs_filedlgg.o -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \ -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@ = dialogs_fontdlgg.o dialogs_filedlgg.o COND_MONOLITHIC_0___WXLIB_CORE_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) @@ -221,16 +219,10 @@ dialogs_dialogs.o: $(srcdir)/dialogs.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp - - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d From 4c06c43f26e9b0be58e63652e877c2f06407e9df Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 30 Sep 2018 14:54:23 +0200 Subject: [PATCH 03/13] Include some Windows specific files in WXQT toolkit Similar as with WXGTK toolkit on Windows. --- Makefile.in | 177 ++++++++++++++++++++++++++++++++++++-- autoconf_inc.m4 | 6 ++ build/bakefiles/files.bkl | 33 +++++++ build/cmake/files.cmake | 25 ++++++ build/files | 23 +++++ configure | 6 ++ 6 files changed, 265 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8eb734fbd4..cef4b270d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2176,6 +2176,16 @@ COND_USE_STC_1___wxscintilla___depname = \ @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION) @COND_PLATFORM_UNIX_0@PLUGVERDELIM = @COND_PLATFORM_UNIX_1@PLUGVERDELIM = - +COND_PLATFORM_WIN32_1_QT_PLATFORM_HDR = \ + wx/msw/dib.h \ + wx/msw/ole/automtn.h \ + wx/msw/joystick.h \ + wx/msw/sound.h \ + wx/msw/ole/safearray.h \ + wx/msw/ole/oleutils.h \ + wx/msw/ole/comimpl.h \ + wx/msw/ole/uuid.h +@COND_PLATFORM_WIN32_1@QT_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_QT_PLATFORM_HDR) COND_PLATFORM_MACOSX_1_GTK_PLATFORM_HDR = \ wx/generic/caret.h \ wx/generic/imaglist.h \ @@ -3561,7 +3571,8 @@ COND_TOOLKIT_QT_GUI_HDR = \ wx/qt/taskbar.h \ wx/generic/activityindicator.h \ wx/qt/dataview.h \ - wx/qt/dvrenderers.h + wx/qt/dvrenderers.h \ + $(QT_PLATFORM_HDR) @COND_TOOLKIT_QT@GUI_HDR = $(COND_TOOLKIT_QT_GUI_HDR) @COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR = @COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR = @@ -5720,8 +5731,20 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \ monodll_qt_toplevel.o \ monodll_qt_uiaction.o \ monodll_qt_utils.o \ - monodll_qt_window.o + monodll_qt_window.o \ + $(__QT_PLATFORM_SRC_OBJECTS) @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS) +COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS = \ + monodll_comimpl.o \ + monodll_msw_dialup.o \ + monodll_dib.o \ + monodll_msw_joystick.o \ + monodll_oleutils.o \ + monodll_uuid.o \ + monodll_safearray.o \ + monodll_msw_sound.o \ + monodll_automtn.o +@COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontmgrcmn.o \ monodll_animateg.o \ @@ -7685,8 +7708,20 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \ monolib_qt_toplevel.o \ monolib_qt_uiaction.o \ monolib_qt_utils.o \ - monolib_qt_window.o + monolib_qt_window.o \ + $(__QT_PLATFORM_SRC_OBJECTS_1) @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1) +COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_1 = \ + monolib_comimpl.o \ + monolib_msw_dialup.o \ + monolib_dib.o \ + monolib_msw_joystick.o \ + monolib_oleutils.o \ + monolib_uuid.o \ + monolib_safearray.o \ + monolib_msw_sound.o \ + monolib_automtn.o +@COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_1) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontmgrcmn.o \ monolib_animateg.o \ @@ -9797,8 +9832,20 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \ coredll_qt_toplevel.o \ coredll_qt_uiaction.o \ coredll_qt_utils.o \ - coredll_qt_window.o + coredll_qt_window.o \ + $(__QT_PLATFORM_SRC_OBJECTS_2) @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2) +COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_2 = \ + coredll_comimpl.o \ + coredll_msw_dialup.o \ + coredll_dib.o \ + coredll_msw_joystick.o \ + coredll_oleutils.o \ + coredll_uuid.o \ + coredll_safearray.o \ + coredll_msw_sound.o \ + coredll_automtn.o +@COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_2) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontmgrcmn.o \ coredll_animateg.o \ @@ -11504,8 +11551,20 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \ corelib_qt_toplevel.o \ corelib_qt_uiaction.o \ corelib_qt_utils.o \ - corelib_qt_window.o + corelib_qt_window.o \ + $(__QT_PLATFORM_SRC_OBJECTS_3) @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3) +COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_3 = \ + corelib_comimpl.o \ + corelib_msw_dialup.o \ + corelib_dib.o \ + corelib_msw_joystick.o \ + corelib_oleutils.o \ + corelib_uuid.o \ + corelib_safearray.o \ + corelib_msw_sound.o \ + corelib_automtn.o +@COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_3) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontmgrcmn.o \ corelib_animateg.o \ @@ -17856,6 +17915,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp @@ -17868,6 +17930,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp @@ -17880,6 +17945,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp @@ -17892,6 +17960,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp @@ -17904,6 +17975,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp @@ -17916,6 +17990,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp @@ -17928,6 +18005,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp @@ -17964,6 +18044,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_utilswin.o: $(srcdir)/src/msw/utilswin.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilswin.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp @@ -17976,6 +18059,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp @@ -23106,6 +23192,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp @@ -23118,6 +23207,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp @@ -23130,6 +23222,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp @@ -23142,6 +23237,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp @@ -23154,6 +23252,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp @@ -23166,6 +23267,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp @@ -23178,6 +23282,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp @@ -23214,6 +23321,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_utilswin.o: $(srcdir)/src/msw/utilswin.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilswin.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp @@ -23226,6 +23336,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp @@ -28449,6 +28562,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp @@ -28461,6 +28577,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp @@ -28473,6 +28592,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp @@ -28485,6 +28607,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp @@ -28497,6 +28622,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp @@ -28509,6 +28637,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp @@ -28521,6 +28652,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp @@ -28557,6 +28691,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilswin.o: $(srcdir)/src/msw/utilswin.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilswin.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp @@ -28569,6 +28706,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(COREDLL_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp @@ -32694,6 +32834,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp @@ -32706,6 +32849,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp @@ -32718,6 +32864,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_comimpl.o: $(srcdir)/src/msw/ole/comimpl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/comimpl.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp @@ -32730,6 +32879,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp @@ -32742,6 +32894,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_safearray.o: $(srcdir)/src/msw/ole/safearray.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/safearray.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp @@ -32754,6 +32909,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp @@ -32766,6 +32924,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp @@ -32802,6 +32963,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilswin.o: $(srcdir)/src/msw/utilswin.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilswin.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp @@ -32814,6 +32978,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(CORELIB_ODEP) +@COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp + @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 8367cfdd6d..8d9e122a8a 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -512,6 +512,12 @@ dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_G COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="" fi AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1) +dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ### + COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" + fi + AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0) dnl ### begin block 20_COND_SHARED_0[wx.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index e501061a11..93c2d75a57 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -242,6 +242,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! + + src/msw/ole/comimpl.cpp + src/msw/dialup.cpp + src/msw/dib.cpp + src/msw/joystick.cpp + src/msw/ole/oleutils.cpp + src/msw/ole/uuid.cpp + src/msw/ole/safearray.cpp + src/msw/sound.cpp + src/msw/ole/automtn.cpp + + + + wx/msw/dib.h + wx/msw/ole/automtn.h + wx/msw/joystick.h + wx/msw/sound.h + wx/msw/ole/safearray.h + wx/msw/ole/oleutils.h + wx/msw/ole/comimpl.h + wx/msw/ole/uuid.h + + + + $(QT_WIN32_SRC) + + + + $(QT_WIN32_HDR) + + wx/qt/accel.h wx/qt/app.h @@ -329,6 +360,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/activityindicator.h wx/qt/dataview.h wx/qt/dvrenderers.h + $(QT_PLATFORM_HDR) @@ -426,6 +458,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/qt/uiaction.cpp src/qt/utils.cpp src/qt/window.cpp + $(QT_PLATFORM_SRC) diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index f0812e7474..acc11ed452 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -165,6 +165,29 @@ set(BASE_OSX_NOTWXMAC_HDR ${BASE_COREFOUNDATION_HDR} ) +set(QT_WIN32_SRC + src/msw/ole/automtn.cpp + src/msw/ole/safearray.cpp + src/msw/sound.cpp + src/msw/ole/oleutils.cpp + src/msw/ole/uuid.cpp + src/msw/ole/comimpl.cpp + src/msw/dialup.cpp + src/msw/dib.cpp + src/msw/joystick.cpp +) + +set(QT_WIN32_HDR + wx/msw/ole/automtn.h + wx/msw/joystick.h + wx/msw/dib.h + wx/msw/ole/uuid.h + wx/msw/ole/safearray.h + wx/msw/sound.h + wx/msw/ole/oleutils.h + wx/msw/ole/comimpl.h +) + set(QT_HDR wx/qt/accel.h wx/qt/app.h @@ -251,6 +274,7 @@ set(QT_HDR wx/qt/taskbar.h wx/qt/dataview.h wx/generic/activityindicator.h + ${QT_PLATFORM_HDR} ) set(QT_SRC @@ -348,6 +372,7 @@ set(QT_SRC src/qt/calctrl.cpp src/qt/dataview.cpp src/qt/taskbar.cpp + ${QT_PLATFORM_SRC} ) set(MEDIA_QT_SRC diff --git a/build/files b/build/files index 7c3b433047..19bdf348ec 100644 --- a/build/files +++ b/build/files @@ -189,7 +189,29 @@ BASE_OSX_NOTWXMAC_HDR = ## Qt +QT_WIN32_SRC= + src/msw/ole/automtn.cpp + src/msw/ole/comimpl.cpp + src/msw/ole/oleutils.cpp + src/msw/ole/safearray.cpp + src/msw/ole/uuid.cpp + src/msw/dialup.cpp + src/msw/dib.cpp + src/msw/joystick.cpp + src/msw/sound.cpp + +QT_WIN32_HDR= + wx/msw/ole/automtn.h + wx/msw/ole/comimpl.h + wx/msw/ole/oleutils.h + wx/msw/ole/safearray.h + wx/msw/ole/uuid.h + wx/msw/dib.h + wx/msw/joystick.h + wx/msw/sound.h + QT_HDR = + $(QT_PLATFORM_HDR) wx/generic/activityindicator.h wx/generic/animate.h wx/generic/caret.h @@ -277,6 +299,7 @@ QT_HDR = wx/qt/window.h QT_SRC= + $(QT_PLATFORM_SRC) src/common/taskbarcmn.cpp src/generic/activityindicator.cpp src/generic/animateg.cpp diff --git a/configure b/configure index 2cb0841699..a624aa99b5 100755 --- a/configure +++ b/configure @@ -748,6 +748,7 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0 +COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1 COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 @@ -41091,6 +41092,11 @@ EOF COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="" fi + COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" + fi + COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then COND_SHARED_0="" From 1dfe088b4d940b2f5628160ec9fc1afbb7d5c439 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 25 Sep 2018 19:41:17 +0200 Subject: [PATCH 04/13] Support WXQT in CMake --- build/cmake/files.cmake | 8 ++++++++ build/cmake/init.cmake | 12 +++++++++++- build/cmake/lib/core/CMakeLists.txt | 5 +++++ build/cmake/lib/gl/CMakeLists.txt | 4 +++- build/cmake/lib/media/CMakeLists.txt | 2 ++ build/cmake/options.cmake | 4 +--- build/cmake/samples/CMakeLists.txt | 18 ++++++++++-------- build/cmake/toolkit.cmake | 14 ++++++++++++++ build/files | 6 ++++++ 9 files changed, 60 insertions(+), 13 deletions(-) diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index acc11ed452..d64208a00d 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -379,6 +379,14 @@ set(MEDIA_QT_SRC src/qt/mediactrl.cpp ) +set(OPENGL_QT_HDR + wx/qt/glcanvas.h +) + +set(OPENGL_QT_SRC + src/qt/glcanvas.cpp +) + set(BASE_CMN_SRC src/common/any.cpp src/common/appbase.cpp diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 4c93866c8f..f967050c5a 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -151,11 +151,21 @@ if(wxUSE_THREADS) endif() if(wxUSE_GUI) - if(WIN32 AND wxUSE_METAFILE) + if(WXMSW AND wxUSE_METAFILE) # this one should probably be made separately configurable set(wxUSE_ENH_METAFILE ON) endif() + # WXQT checks + if(WXQT) + wx_option_force_value(wxUSE_WEBVIEW OFF) + wx_option_force_value(wxUSE_METAFILE OFF) + if(WIN32) + wx_option_force_value(wxUSE_ACCESSIBILITY OFF) + endif() + endif() + + # extra dependencies if(wxUSE_OPENGL) find_package(OpenGL) if(NOT OPENGL_FOUND) diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt index 3bd8719d91..20e4636cbf 100644 --- a/build/cmake/lib/core/CMakeLists.txt +++ b/build/cmake/lib/core/CMakeLists.txt @@ -41,6 +41,11 @@ elseif(WXOSX_COCOA) wx_append_sources(CORE_SRC OSX_LOWLEVEL) wx_append_sources(CORE_SRC OSX_SHARED) wx_append_sources(CORE_SRC OSX_COCOA) +elseif(WXQT) + wx_append_sources(CORE_SRC QT) + if(WIN32) + wx_append_sources(CORE_SRC QT_WIN32) + endif() endif() wx_add_library(core ${CORE_SRC}) diff --git a/build/cmake/lib/gl/CMakeLists.txt b/build/cmake/lib/gl/CMakeLists.txt index 18ac4ac855..605a2b4f66 100644 --- a/build/cmake/lib/gl/CMakeLists.txt +++ b/build/cmake/lib/gl/CMakeLists.txt @@ -11,12 +11,14 @@ include(../../source_groups.cmake) wx_append_sources(GL_FILES OPENGL_CMN) -if(WIN32) +if(WXMSW) wx_append_sources(GL_FILES OPENGL_MSW) elseif(WXGTK) wx_append_sources(GL_FILES OPENGL_GTK) elseif(APPLE) wx_append_sources(GL_FILES OPENGL_OSX_SHARED) +elseif(WXQT) + wx_append_sources(GL_FILES OPENGL_QT) endif() wx_add_library(gl ${GL_FILES}) diff --git a/build/cmake/lib/media/CMakeLists.txt b/build/cmake/lib/media/CMakeLists.txt index 5c536daa1a..7452774956 100644 --- a/build/cmake/lib/media/CMakeLists.txt +++ b/build/cmake/lib/media/CMakeLists.txt @@ -17,6 +17,8 @@ elseif(WXOSX_COCOA) wx_append_sources(MEDIA_FILES MEDIA_OSX_COCOA) elseif(UNIX) wx_append_sources(MEDIA_FILES MEDIA_UNIX) +elseif(WXQT) + wx_append_sources(MEDIA_FILES MEDIA_QT) endif() wx_add_library(media ${MEDIA_FILES}) diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index 48b2ddf70a..b399e7ec2f 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -353,9 +353,6 @@ wx_option(wxUSE_HOTKEY "use wxWindow::RegisterHotKey()") wx_option(wxUSE_JOYSTICK "use wxJoystick") wx_option(wxUSE_METAFILE "use wxMetaFile") wx_option(wxUSE_DRAGIMAGE "use wxDragImage") -if(WXMSW) - wx_option(wxUSE_ACCESSIBILITY "enable accessibility support") -endif() wx_option(wxUSE_UIACTIONSIMULATOR "use wxUIActionSimulator (experimental)") wx_option(wxUSE_DC_TRANSFORM_MATRIX "use wxDC::SetTransformMatrix and related") wx_option(wxUSE_WEBVIEW_WEBKIT "use wxWebView WebKit backend") @@ -403,6 +400,7 @@ if(WIN32) set(wxUSE_WINRT_DEFAULT OFF) endif() wx_option(wxUSE_WINRT "enable WinRT support" ${wxUSE_WINRT_DEFAULT}) + wx_option(wxUSE_ACCESSIBILITY "enable accessibility support") endif() # this one is not really MSW-specific but it exists mainly to be turned off diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt index 0e19f47d72..09a299ffbd 100644 --- a/build/cmake/samples/CMakeLists.txt +++ b/build/cmake/samples/CMakeLists.txt @@ -264,13 +264,15 @@ if(WIN32) wx_add_sample(dll sdk_exe.cpp my_dll.h NAME sdk_exe FOLDER dll LIBRARIES my_dll) endif() - if(MSVC) - wx_add_sample(flash) - endif() - #TODO: reenable when sample is fixed - #wx_add_sample(mfc mfctest.cpp mfctest.h resource.h stdafx.h RES mfctest.rc) - wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc) - wx_add_sample(oleauto DEPENDS wxUSE_OLE) + wx_add_sample(regtest RES regtest.rc DEPENDS wxUSE_REGKEY) - wx_add_sample(taskbarbutton DEPENDS wxUSE_TASKBARBUTTON) + wx_add_sample(oleauto DEPENDS wxUSE_OLE) + + if(WXMSW) + wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc) + #TODO: reenable when sample is fixed + #wx_add_sample(mfc mfctest.cpp mfctest.h resource.h stdafx.h RES mfctest.rc) + wx_add_sample(taskbarbutton DEPENDS wxUSE_TASKBARBUTTON) + wx_add_sample(flash DEPENDS wxUSE_ACTIVEX) + endif() endif() diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake index 02f9982920..2117f7cace 100644 --- a/build/cmake/toolkit.cmake +++ b/build/cmake/toolkit.cmake @@ -46,6 +46,8 @@ if(wxBUILD_TOOLKIT MATCHES "^gtk*") set(WXGTK ON) elseif(wxBUILD_TOOLKIT MATCHES "^osx*") set(WXOSX ON) +elseif(wxBUILD_TOOLKIT MATCHES "qt") + set(WXQT ON) endif() set(wxTOOLKIT_DEFINITIONS __WX${toolkit_upper}__) @@ -113,7 +115,19 @@ if(WXGTK) endif() endif() +if(WXQT) + set(QT_COMPONENTS Core Widgets Gui OpenGL Test) + foreach(QT_COMPONENT ${QT_COMPONENTS}) + find_package(Qt5 COMPONENTS ${QT_COMPONENT} REQUIRED) + list(APPEND wxTOOLKIT_INCLUDE_DIRS ${Qt5${QT_COMPONENT}_INCLUDE_DIRS}) + list(APPEND wxTOOLKIT_LIBRARIES ${Qt5${QT_COMPONENT}_LIBRARIES}) + list(APPEND wxTOOLKIT_DEFINITIONS ${Qt5${QT_COMPONENT}_COMPILE_DEFINITIONS}) + endforeach() + set(wxTOOLKIT_VERSION ${Qt5Core_VERSION}) +endif() + if(APPLE) list(APPEND wxTOOLKIT_DEFINITIONS __WXMAC__ __WXOSX__) endif() + endif() # wxUSE_GUI diff --git a/build/files b/build/files index 19bdf348ec..13b2eae984 100644 --- a/build/files +++ b/build/files @@ -398,6 +398,12 @@ QT_SRC= MEDIA_QT_SRC= src/qt/mediactrl.cpp +OPENGL_QT_HDR= + wx/qt/glcanvas.h + +OPENGL_QT_SRC= + src/qt/glcanvas.cpp + ## Common BASE_CMN_SRC = From f5b4d707b82d95f50071354b3722d8206127183e Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 25 Sep 2018 19:45:42 +0200 Subject: [PATCH 05/13] Do not use variable-length array in WXQT wxRegion This is not supported by MSVC compiler. --- src/qt/region.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qt/region.cpp b/src/qt/region.cpp index ad6551d3ea..45936ab577 100644 --- a/src/qt/region.cpp +++ b/src/qt/region.cpp @@ -10,6 +10,7 @@ #include "wx/region.h" #include "wx/bitmap.h" +#include "wx/scopedarray.h" #include "wx/qt/private/converter.h" #include "wx/qt/private/utils.h" @@ -106,8 +107,8 @@ wxRegion::wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance) return; } - unsigned char raw[bmp.GetWidth()*bmp.GetHeight()]; - memset(raw, 0, bmp.GetWidth()*bmp.GetHeight()); + wxScopedArray raw(bmp.GetWidth()*bmp.GetHeight()); + memset(raw.get(), 0, bmp.GetWidth()*bmp.GetHeight()); QImage img(bmp.GetHandle()->toImage()); int r = transp.Red(), g = transp.Green(), b = transp.Blue(); @@ -125,7 +126,7 @@ wxRegion::wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance) } } - m_refData = new wxRegionRefData(QBitmap::fromData(bmp.GetHandle()->size(), raw)); + m_refData = new wxRegionRefData(QBitmap::fromData(bmp.GetHandle()->size(), raw.get())); } bool wxRegion::IsEmpty() const From 8f017509f6e037cf150e472b63f9477709ebc38f Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 25 Sep 2018 19:52:58 +0200 Subject: [PATCH 06/13] Remove wxConsoleEventLoop from WXQT The console event loop in the wxBase library is GUI toolkit independent. --- include/wx/qt/evtloop.h | 14 +------------- src/qt/evtloop.cpp | 12 ------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/include/wx/qt/evtloop.h b/include/wx/qt/evtloop.h index 6034a808a7..25ea24a8dc 100644 --- a/include/wx/qt/evtloop.h +++ b/include/wx/qt/evtloop.h @@ -10,7 +10,7 @@ class QTimer; -class WXDLLIMPEXP_BASE wxQtEventLoopBase : public wxEventLoopBase +class WXDLLIMPEXP_CORE wxQtEventLoopBase : public wxEventLoopBase { public: wxQtEventLoopBase(); @@ -44,18 +44,6 @@ public: wxGUIEventLoop(); }; -#else // !wxUSE_GUI - -#if wxUSE_CONSOLE_EVENTLOOP - -class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxQtEventLoopBase -{ -public: - wxConsoleEventLoop(); -}; - -#endif // wxUSE_CONSOLE_EVENTLOOP - #endif // wxUSE_GUI #endif // _WX_QT_EVTLOOP_H_ diff --git a/src/qt/evtloop.cpp b/src/qt/evtloop.cpp index a0f1d549f9..2cb13ba0f6 100644 --- a/src/qt/evtloop.cpp +++ b/src/qt/evtloop.cpp @@ -259,16 +259,4 @@ wxGUIEventLoop::wxGUIEventLoop() { } -#else // !wxUSE_GUI - -//############################################################################# - -#if wxUSE_CONSOLE_EVENTLOOP - -wxConsoleEventLoop::wxConsoleEventLoop() -{ -} - -#endif // wxUSE_CONSOLE_EVENTLOOP - #endif // wxUSE_GUI From 487a3854a3f551905e2531898a0cb625fdf96838 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 25 Sep 2018 23:23:57 +0200 Subject: [PATCH 07/13] Fix building stc library with WXQT When using MSVC compiler, wxUSE_GRAPHICS_DIRECT2D is automatically enabled in setup.h. But it is only available with WXMSW toolkit, not WXGTK or WXQT. --- src/stc/PlatWX.cpp | 18 +++++++++++------- src/stc/ScintillaWX.cpp | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index 1efb9d9de0..8a21bce9ab 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -44,7 +44,11 @@ #include "wx/stc/stc.h" #include "wx/stc/private.h" -#if wxUSE_GRAPHICS_DIRECT2D +#if defined(__WXMSW__) && wxUSE_GRAPHICS_DIRECT2D +#define HAVE_DIRECTWRITE_TECHNOLOGY +#endif + +#ifdef HAVE_DIRECTWRITE_TECHNOLOGY #include "ScintillaWX.h" #include #include "wx/dcscreen.h" @@ -165,11 +169,11 @@ void Font::Create(const FontParameters &fp) { wxFontWithAscent* newFont = new wxFontWithAscent(font); fid = newFont; -#if wxUSE_GRAPHICS_DIRECT2D +#ifdef HAVE_DIRECTWRITE_TECHNOLOGY if ( fp.technology == wxSTC_TECHNOLOGY_DIRECTWRITE ) { newFont->SetSurfaceFontData(new SurfaceFontDataD2D(fp)); } -#endif // wxUSE_GRAPHICS_DIRECT2D +#endif // HAVE_DIRECTWRITE_TECHNOLOGY } @@ -694,7 +698,7 @@ void SurfaceImpl::SetDBCSMode(int WXUNUSED(codePage)) { // dbcsMode = codePage == SC_CP_DBCS; } -#if wxUSE_GRAPHICS_DIRECT2D +#ifdef HAVE_DIRECTWRITE_TECHNOLOGY //---------------------------------------------------------------------- // SurfaceFontDataD2D @@ -1805,16 +1809,16 @@ void SurfaceD2D::DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase, } } -#endif // wxUSE_GRAPHICS_DIRECT2D +#endif // HAVE_DIRECTWRITE_TECHNOLOGY Surface *Surface::Allocate(int technology) { wxUnusedVar(technology); -#if wxUSE_GRAPHICS_DIRECT2D +#ifdef HAVE_DIRECTWRITE_TECHNOLOGY if ( technology == wxSTC_TECHNOLOGY_DIRECTWRITE ) { return new SurfaceD2D; } -#endif // wxUSE_GRAPHICS_DIRECT2D +#endif // HAVE_DIRECTWRITE_TECHNOLOGY return new SurfaceImpl; } diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index ad5f506c35..dc65fcedf9 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -825,7 +825,7 @@ sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) } #endif -#if wxUSE_GRAPHICS_DIRECT2D +#if defined(__WXMSW__) && wxUSE_GRAPHICS_DIRECT2D case SCI_SETTECHNOLOGY: if ((wParam == SC_TECHNOLOGY_DEFAULT) || (wParam == SC_TECHNOLOGY_DIRECTWRITE)) { if (technology != static_cast(wParam)) { From bb82470640d9f9677de95112b43bfe92aa042f65 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 26 Sep 2018 19:57:42 +0200 Subject: [PATCH 08/13] Fix missing gl functions in WXQT --- include/wx/qt/glcanvas.h | 23 +++++++++++++++++++- src/qt/glcanvas.cpp | 45 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/include/wx/qt/glcanvas.h b/include/wx/qt/glcanvas.h index a67efa09b0..0e872e343f 100644 --- a/include/wx/qt/glcanvas.h +++ b/include/wx/qt/glcanvas.h @@ -17,7 +17,9 @@ class QGLFormat; class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase { public: - wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL); + wxGLContext(wxGLCanvas *win, + const wxGLContext *other = NULL, + const wxGLContextAttrs *ctxAttrs = NULL); /// virtual ~wxGLContext(); virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; @@ -36,6 +38,16 @@ class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase { public: explicit // avoid implicitly converting a wxWindow* to wxGLCanvas + wxGLCanvas(wxWindow *parent, + const wxGLAttributes& dispAttrs, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxGLCanvasName, + const wxPalette& palette = wxNullPalette); + + explicit wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY, const int *attribList = NULL, @@ -45,6 +57,15 @@ public: const wxString& name = wxGLCanvasName, const wxPalette& palette = wxNullPalette); + bool Create(wxWindow *parent, + const wxGLAttributes& dispAttrs, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxGLCanvasName, + const wxPalette& palette = wxNullPalette); + bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, diff --git a/src/qt/glcanvas.cpp b/src/qt/glcanvas.cpp index ba8b49678b..2430d84384 100644 --- a/src/qt/glcanvas.cpp +++ b/src/qt/glcanvas.cpp @@ -329,7 +329,7 @@ void wxGLAttributes::AddDefaultsForWXBefore31() wxIMPLEMENT_CLASS(wxGLContext, wxWindow); -wxGLContext::wxGLContext(wxGLCanvas *WXUNUSED(win), const wxGLContext* WXUNUSED(other)) +wxGLContext::wxGLContext(wxGLCanvas *WXUNUSED(win), const wxGLContext* WXUNUSED(other), const wxGLContextAttrs *WXUNUSED(ctxAttrs)) { // m_glContext = win->GetHandle()->context(); } @@ -347,6 +347,18 @@ bool wxGLContext::SetCurrent(const wxGLCanvas&) const wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow); +wxGLCanvas::wxGLCanvas(wxWindow *parent, + const wxGLAttributes& dispAttrs, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name, + const wxPalette& palette) +{ + Create(parent, dispAttrs, id, pos, size, style, name, palette); +} + wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id, const int *attribList, @@ -359,6 +371,19 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent, Create(parent, id, pos, size, style, name, attribList, palette); } +bool wxGLCanvas::Create(wxWindow *parent, + const wxGLAttributes& dispAttrs, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name, + const wxPalette& palette) +{ + wxLogError("Missing implementation of " + wxString(__FUNCTION__)); + return false; +} + bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -509,4 +534,22 @@ wxGLCanvasBase::IsDisplaySupported(const int *attribList) return QGLWidget(format).isValid(); } +/* static */ +bool +wxGLCanvasBase::IsDisplaySupported(const wxGLAttributes& dispAttrs) +{ + wxLogError("Missing implementation of " + wxString(__FUNCTION__)); + return false; +} + +// ---------------------------------------------------------------------------- +// wxGLApp +// ---------------------------------------------------------------------------- + +bool wxGLApp::InitGLVisual(const int *attribList) +{ + wxLogError("Missing implementation of " + wxString(__FUNCTION__)); + return false; +} + #endif // wxUSE_GLCANVAS From 4e23b3e7f4c9106661c8f2584b3c33656d8fc28f Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 30 Sep 2018 00:25:29 +0200 Subject: [PATCH 09/13] Fix missing wxOwnerDrawn functions in WXQT wxMenuItem --- include/wx/qt/menuitem.h | 23 +++++++++++++++++++++++ src/qt/menuitem.cpp | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/include/wx/qt/menuitem.h b/include/wx/qt/menuitem.h index 158007fc4e..953e48c565 100644 --- a/include/wx/qt/menuitem.h +++ b/include/wx/qt/menuitem.h @@ -9,12 +9,20 @@ #define _WX_QT_MENUITEM_H_ #include "wx/menuitem.h" + +#if wxUSE_OWNER_DRAWN + #include "wx/ownerdrw.h" +#endif + class QAction; class WXDLLIMPEXP_FWD_CORE wxBitmap; class WXDLLIMPEXP_FWD_CORE wxMenu; class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase +#if wxUSE_OWNER_DRAWN + , public wxOwnerDrawnBase +#endif { public: wxMenuItem(wxMenu *parentMenu = NULL, @@ -33,15 +41,30 @@ public: virtual void Check(bool check = true); virtual bool IsChecked() const; + void SetBitmaps(const wxBitmap& bmpChecked, + const wxBitmap& bmpUnchecked = wxNullBitmap); void SetBitmap(const wxBitmap& bitmap); const wxBitmap& GetBitmap() const; virtual QAction *GetHandle() const; +#if wxUSE_OWNER_DRAWN + void SetDisabledBitmap(const wxBitmap& bmpDisabled); + const wxBitmap& GetDisabledBitmap() const; + + // override wxOwnerDrawn base class virtuals + virtual wxString GetName() const wxOVERRIDE; + virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) wxOVERRIDE; +#endif // wxUSE_OWNER_DRAWN + private: // Qt is using an action instead of a menu item. QAction *m_qtAction; +#if wxUSE_OWNER_DRAWN + wxBitmap m_bmpDisabled; +#endif // wxUSE_OWNER_DRAWN + wxDECLARE_DYNAMIC_CLASS( wxMenuItem ); }; diff --git a/src/qt/menuitem.cpp b/src/qt/menuitem.cpp index eab049e342..85106eff59 100644 --- a/src/qt/menuitem.cpp +++ b/src/qt/menuitem.cpp @@ -106,6 +106,12 @@ bool wxMenuItem::IsChecked() const } +void wxMenuItem::SetBitmaps(const wxBitmap& WXUNUSED(bmpChecked), + const wxBitmap& WXUNUSED(bmpUnchecked)) +{ + wxMISSING_FUNCTION(); +} + void wxMenuItem::SetBitmap(const wxBitmap& WXUNUSED(bitmap)) { wxMISSING_FUNCTION(); @@ -125,6 +131,34 @@ QAction *wxMenuItem::GetHandle() const return m_qtAction; } +#if wxUSE_OWNER_DRAWN + +void wxMenuItem::SetDisabledBitmap(const wxBitmap& bmpDisabled) +{ + m_bmpDisabled = bmpDisabled; + wxMISSING_FUNCTION(); +} + +const wxBitmap& wxMenuItem::GetDisabledBitmap() const +{ + wxMISSING_FUNCTION(); + return m_bmpDisabled; +} + +wxString wxMenuItem::GetName() const +{ + return GetItemLabelText(); +} + +bool wxMenuItem::OnDrawItem(wxDC& WXUNUSED(dc), const wxRect& WXUNUSED(rc), + wxODAction WXUNUSED(act), wxODStatus WXUNUSED(stat)) +{ + wxMISSING_FUNCTION(); + return false; +} + +#endif // wxUSE_OWNER_DRAWN + //============================================================================= wxQtAction::wxQtAction( wxMenu *parent, int id, const wxString &text, const wxString &help, From 7f0d7ef5200e35ea50e7ea593804b455cb0a0a13 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 25 Sep 2018 21:28:30 +0200 Subject: [PATCH 10/13] Fix several build errors in WXQT Move declaration of wxOwnerDrawnBase::ms_defaultMargin to correct file. Do not include headers when wxUSE_UIACTIONSIMULATOR is disabled. Add guards for wxUSE_DRAG_AND_DROP. Use a different wxFont constructor in printing sample, which is also available in WXQT. --- include/wx/qt/window.h | 2 ++ samples/printing/printing.cpp | 2 +- src/common/ownerdrwcmn.cpp | 6 ++++++ src/msw/ownerdrw.cpp | 6 ------ src/qt/dnd.cpp | 3 +++ src/qt/uiaction.cpp | 4 ++-- src/qt/window.cpp | 2 ++ 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h index 192ae2b54a..df402a42d4 100644 --- a/include/wx/qt/window.h +++ b/include/wx/qt/window.h @@ -133,7 +133,9 @@ public: QWidget *GetHandle() const wxOVERRIDE; +#if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; +#endif #if wxUSE_ACCEL // accelerators diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp index 719ccb63bc..c3448b09f5 100644 --- a/samples/printing/printing.cpp +++ b/samples/printing/printing.cpp @@ -106,7 +106,7 @@ bool MyApp::OnInit(void) m_bitmap = image; #endif m_angle = 30; - m_testFont.Create(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + m_testFont = wxFontInfo(10).Family(wxFONTFAMILY_SWISS); // Create the main frame window diff --git a/src/common/ownerdrwcmn.cpp b/src/common/ownerdrwcmn.cpp index 967a5a285b..faa6b4240a 100644 --- a/src/common/ownerdrwcmn.cpp +++ b/src/common/ownerdrwcmn.cpp @@ -36,6 +36,12 @@ #include "wx/utils.h" #endif +// ---------------------------------------------------------------------------- +// constants for base class +// ---------------------------------------------------------------------------- + +int wxOwnerDrawnBase::ms_defaultMargin = 3; + // ============================================================================ // implementation // ============================================================================ diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 166e84542d..fa3ef819b7 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -23,12 +23,6 @@ #include "wx/msw/private/dc.h" #include "wx/msw/wrapcctl.h" // for HIMAGELIST -// ---------------------------------------------------------------------------- -// constants for base class -// ---------------------------------------------------------------------------- - -int wxOwnerDrawnBase::ms_defaultMargin = 3; - // ============================================================================ // implementation of wxOwnerDrawn class // ============================================================================ diff --git a/src/qt/dnd.cpp b/src/qt/dnd.cpp index 3b7fda37b8..7e99e94ec2 100644 --- a/src/qt/dnd.cpp +++ b/src/qt/dnd.cpp @@ -8,6 +8,8 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_DRAG_AND_DROP + #include "wx/dnd.h" wxDropTarget::wxDropTarget(wxDataObject *WXUNUSED(dataObject)) @@ -58,3 +60,4 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags)) return wxDragResult(); } +#endif // wxUSE_DRAG_AND_DROP diff --git a/src/qt/uiaction.cpp b/src/qt/uiaction.cpp index 1ac40a3916..5ca92385b8 100644 --- a/src/qt/uiaction.cpp +++ b/src/qt/uiaction.cpp @@ -12,6 +12,8 @@ #pragma hdrstop #endif +#if wxUSE_UIACTIONSIMULATOR + #include "wx/uiaction.h" #include "wx/private/uiaction.h" @@ -24,8 +26,6 @@ #include "wx/qt/private/converter.h" -#if wxUSE_UIACTIONSIMULATOR - using namespace Qt; using namespace QTest; diff --git a/src/qt/window.cpp b/src/qt/window.cpp index b82a4e3054..183a277f89 100644 --- a/src/qt/window.cpp +++ b/src/qt/window.cpp @@ -650,10 +650,12 @@ void wxWindowQt::ScrollWindow( int dx, int dy, const wxRect *rect ) } +#if wxUSE_DRAG_AND_DROP void wxWindowQt::SetDropTarget( wxDropTarget * WXUNUSED( dropTarget ) ) { wxMISSING_IMPLEMENTATION( __FUNCTION__ ); } +#endif void wxWindowQt::SetWindowStyleFlag( long style ) { From bf823e0419f2abb3baac7a41eb0242cb6059397f Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 25 Sep 2018 19:57:40 +0200 Subject: [PATCH 11/13] Check if AppVeyor should abort before cloning the repo --- appveyor.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5b3d335e05..5a416536d7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,6 +41,13 @@ clone_depth: 50 install: git submodule update --init +init: +- ps: | + if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` + https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` + Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` + throw "There are newer queued builds for this pull request, failing early." } + before_build: - ps: | $env:PATH = $env:PATH -replace "C:\\Program Files\\Git\\usr\\bin","" @@ -49,10 +56,6 @@ before_build: %{$_ -replace "define wxUSE_STL 0", "define wxUSE_STL $env:wxUSE_STL"} | sc include\wx\msw\setup.h } - if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` - https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` - Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` - throw "There are newer queued builds for this pull request, failing early." } build_script: c:\projects\wxwidgets\build\tools\appveyor.bat From f7d1f46144a052ad271a151602da7e9c50e49d5b Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 25 Sep 2018 19:46:21 +0200 Subject: [PATCH 12/13] Build WXQT toolkit with AppVeyor --- appveyor.yml | 4 ++++ build/tools/appveyor-test.bat | 7 ++++++- build/tools/appveyor.bat | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5a416536d7..6737b09320 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,6 +36,10 @@ environment: GENERATOR: 'Visual Studio 12' SHARED: ON CONFIGURATION: Release + - TOOLSET: cmake_qt + GENERATOR: 'Visual Studio 14 2015 Win64' + SHARED: ON + CONFIGURATION: Release clone_depth: 50 diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat index 3149c807eb..d9eb84dad4 100755 --- a/build/tools/appveyor-test.bat +++ b/build/tools/appveyor-test.bat @@ -42,10 +42,15 @@ echo --- Note: ignoring possible test failures under Cygwin echo. exit /b 0 +:cmake_qt +set CMAKE_TEST_REGEX="test_base" +goto :cmake + :cmake if "%CONFIGURATION%"=="" set CONFIGURATION=Release +if "%CMAKE_TEST_REGEX%"=="" set CMAKE_TEST_REGEX="test_[base|gui]" cd ..\build_cmake -ctest -V -C %CONFIGURATION% -R "test_[base|gui]" --output-on-failure --interactive-debug-mode 0 . +ctest -V -C %CONFIGURATION% -R %CMAKE_TEST_REGEX% --output-on-failure --interactive-debug-mode 0 . if %errorlevel% NEQ 0 goto :error goto :eof diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat index c2bc21f345..17a14d0369 100644 --- a/build/tools/appveyor.bat +++ b/build/tools/appveyor.bat @@ -78,6 +78,12 @@ set SKIPTESTS=1 set CMAKE_NATIVE_FLAGS=-j3 goto cmake +:cmake_qt +set SKIPINSTALL=1 +set QT5DIR="C:\Qt\5.11\msvc2015_64" +set CMAKE_CONFIGURE_FLAGS=-DCMAKE_PREFIX_PATH=%QT5DIR% -DwxBUILD_TOOLKIT="qt" -DCMAKE_CXX_STANDARD=11 +goto cmake + :cmake echo --- Tools versions: cmake --version From fa19acacbecb6919a83519ebd09c7cc92999bffa Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 30 Sep 2018 19:49:54 +0200 Subject: [PATCH 13/13] Improve WXGTK build on Windows with CMake --- build/cmake/init.cmake | 27 ++++++++++ build/cmake/lib/core/CMakeLists.txt | 8 +++ build/cmake/modules/FindFontconfig.cmake | 69 ++++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 build/cmake/modules/FindFontconfig.cmake diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index f967050c5a..919ce4c570 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -165,6 +165,25 @@ if(wxUSE_GUI) endif() endif() + # WXGTK checks, match include/wx/gtk/chkconf.h + if(WXGTK) + wx_option_force_value(wxUSE_METAFILE OFF) + + if(WIN32) + wx_option_force_value(wxUSE_CAIRO ON) + wx_option_force_value(wxUSE_ACCESSIBILITY OFF) + wx_option_force_value(wxUSE_OWNER_DRAWN OFF) + endif() + + if(NOT UNIX) + wx_option_force_value(wxUSE_WEBVIEW OFF) + wx_option_force_value(wxUSE_MEDIACTRL OFF) + wx_option_force_value(wxUSE_UIACTIONSIMULATOR OFF) + wx_option_force_value(wxUSE_OPENGL OFF) + set(wxUSE_GLCANVAS OFF) + endif() + endif() + # extra dependencies if(wxUSE_OPENGL) find_package(OpenGL) @@ -183,6 +202,14 @@ if(wxUSE_GUI) endif() endif() + if(wxUSE_PRIVATE_FONTS AND WXGTK) + find_package(Fontconfig) + if(NOT FONTCONFIG_FOUND) + message(WARNING "Fontconfig not found, Private fonts won't be available") + wx_option_force_value(wxUSE_PRIVATE_FONTS OFF) + endif() + endif() + if(wxUSE_MEDIACTRL AND UNIX AND NOT APPLE AND NOT WIN32) find_package(GStreamer) if(NOT GSTREAMER_FOUND) diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt index 20e4636cbf..e7ed60ef67 100644 --- a/build/cmake/lib/core/CMakeLists.txt +++ b/build/cmake/lib/core/CMakeLists.txt @@ -71,5 +71,13 @@ if(WXOSX_COCOA) "-framework AudioToolbox" ) endif() +if(WXGTK AND wxUSE_PRIVATE_FONTS) + wx_lib_include_directories(core PUBLIC + ${FONTCONFIG_INCLUDE_DIR} + ) + wx_lib_link_libraries(core PUBLIC + ${FONTCONFIG_LIBRARIES} + ) +endif() wx_finalize_lib(core) diff --git a/build/cmake/modules/FindFontconfig.cmake b/build/cmake/modules/FindFontconfig.cmake new file mode 100644 index 0000000000..e6fa81d8ef --- /dev/null +++ b/build/cmake/modules/FindFontconfig.cmake @@ -0,0 +1,69 @@ +# - Try to find the Fontconfig +# Once done this will define +# +# FONTCONFIG_FOUND - system has Fontconfig +# FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers +# FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG +# FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG + +# Copyright (c) 2006,2007 Laurent Montel, +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) + + # in cache already + set(FONTCONFIG_FOUND TRUE) + +else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) + + if (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + find_package(PkgConfig) + pkg_check_modules(PC_FONTCONFIG fontconfig) + + set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER}) + endif (NOT WIN32) + + find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h + PATHS + ${PC_FONTCONFIG_INCLUDEDIR} + ${PC_FONTCONFIG_INCLUDE_DIRS} + /usr/X11/include + ) + + find_library(FONTCONFIG_LIBRARIES NAMES fontconfig + PATHS + ${PC_FONTCONFIG_LIBDIR} + ${PC_FONTCONFIG_LIBRARY_DIRS} + ) + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR ) + + mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR) + +endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)