<?xml version="1.0" ?>
-<!-- $Id$ -->
<makefile>
<!--
====================================================================== -->
-
+<if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+ <define-rule name="__mm-to-$(OBJEXT[1:])" extends="__any,compilation_rule">
+ </define-rule>
+</if>
<!-- ====================================================================== -->
<!-- wxBase -->
src/unix/timerunx.cpp
src/unix/threadpsx.cpp
src/unix/utilsunx.cpp
+ src/unix/wakeuppipe.cpp
src/unix/fswatcher_kqueue.cpp
</set>
src/msw/dde.cpp
src/msw/dir.cpp
src/msw/dlmsw.cpp
+ src/msw/evtloopconsole.cpp
src/msw/mimetype.cpp
src/msw/power.cpp
src/msw/regconf.cpp
src/msw/fswatcher.cpp
</set>
<set var="BASE_AND_GUI_WIN32_SRC" hints="files">
- src/msw/evtloop.cpp
src/msw/main.cpp
src/msw/mslu.cpp
src/msw/volume.cpp
wx/msw/crashrpt.h
wx/msw/dde.h
wx/msw/debughlp.h
+ wx/msw/evtloopconsole.h
wx/msw/gccpriv.h
wx/msw/libraries.h
wx/msw/mimetype.h
wx/osx/core/cfref.h
wx/osx/core/cfstring.h
wx/osx/core/hid.h
+ wx/osx/core/evtloop.h
+ wx/osx/core/objcid.h
wx/osx/core/private.h
wx/osx/core/stdpaths.h
- wx/osx/core/private/strconv_cf.h
</set>
<!-- Base files used by OS X ports (not Carbon) -->
wx/os2/wxrsc.h
</set>
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<!-- PalmOS -->
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-
-<set var="BASE_PALMOS_SRC" hints="files">
- src/palmos/base.cpp
- src/palmos/dir.cpp
- src/palmos/prefconf.cpp
- src/palmos/snglinst.cpp
- src/palmos/stdall.c
- src/palmos/thread.cpp
- src/palmos/utils.cpp
- src/palmos/utilsexc.cpp
-</set>
-
-<set var="BASE_AND_GUI_PALMOS_SRC" hints="files">
- src/palmos/main.cpp
- src/palmos/volume.cpp
-</set>
-
-<set var="BASE_PALMOS_HDR" hints="files">
- wx/palmos/apptbase.h
- wx/palmos/apptrait.h
- wx/palmos/chkconf.h
- wx/palmos/mimetype.h
- wx/palmos/missing.h
- wx/palmos/stdpaths.h
-</set>
-
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<!-- MSDOS -->
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
src/common/tarstrm.cpp
src/common/textbuf.cpp
src/common/textfile.cpp
+ src/common/threadinfo.cpp
+ src/common/time.cpp
src/common/timercmn.cpp
src/common/timerimpl.cpp
src/common/tokenzr.cpp
wx/clntdata.h
wx/cmdargs.h
wx/cmdline.h
+ wx/compiler.h
wx/confbase.h
wx/config.h
wx/convauto.h
wx/dynload.h
wx/encconv.h
wx/event.h
+ wx/eventfilter.h
wx/evtloop.h
wx/except.h
wx/features.h
wx/textfile.h
wx/thread.h
wx/thrimpl.cpp
+ wx/time.h
wx/timer.h
wx/tls.h
wx/tokenzr.h
wx/meta/int2type.h
wx/meta/movable.h
wx/meta/pod.h
+ wx/meta/removeref.h
wx/fswatcher.h
wx/generic/fswatcher.h
</set>
src/msw/urlmsw.cpp
</set>
<set var="NET_WIN32_HDR" hints="files">
- wx/msw/private/sockmsw.h
</set>
<set var="NET_WINCE_SRC" hints="files">
src/common/markupparser.cpp
src/common/matrix.cpp
src/common/menucmn.cpp
+ src/common/modalhook.cpp
src/common/mousemanager.cpp
src/common/nbkbase.cpp
src/common/overlaycmn.cpp
src/common/persist.cpp
src/common/pickerbase.cpp
src/common/popupcmn.cpp
+ src/common/preferencescmn.cpp
src/common/prntbase.cpp
src/common/quantize.cpp
src/common/radiobtncmn.cpp
src/common/tbarbase.cpp
src/common/textcmn.cpp
src/common/textentrycmn.cpp
+ src/common/textmeasurecmn.cpp
src/common/toplvcmn.cpp
src/common/treebase.cpp
src/common/uiactioncmn.cpp
src/generic/markuptext.cpp
src/generic/msgdlgg.cpp
src/generic/numdlgg.cpp
- src/generic/panelg.cpp
src/generic/progdlgg.cpp
+ src/generic/preferencesg.cpp
src/generic/printps.cpp
src/generic/renderg.cpp
src/generic/richmsgdlgg.cpp
src/generic/treebkg.cpp
src/generic/vlbox.cpp
src/generic/vscroll.cpp
+ src/xrc/xmlreshandler.cpp
</set>
<set var="GUI_CMN_HDR" hints="files">
wx/affinematrix2dbase.h
wx/bmpbuttn.h
wx/brush.h
wx/button.h
- wx/cairo.h
wx/checkbox.h
wx/checklst.h
wx/choicdlg.h
wx/control.h
wx/ctrlsub.h
wx/cursor.h
+ wx/custombgwin.h
wx/dc.h
wx/dcclient.h
wx/dcgraph.h
wx/generic/choicdgg.h
wx/generic/colrdlgg.h
wx/generic/combo.h
+ wx/generic/custombgwin.h
wx/generic/dcpsg.h
wx/generic/dirctrlg.h
wx/generic/dragimgg.h
wx/listbox.h
wx/mdi.h
wx/menu.h
+ wx/modalhook.h
wx/mousemanager.h
wx/msgdlg.h
wx/nativewin.h
wx/valnum.h
wx/window.h
wx/windowid.h
+ wx/windowptr.h
wx/withimages.h
wx/wrapsizer.h
wx/wupdlock.h
wx/rawbmp.h
wx/region.h
wx/scopeguard.h
+ wx/simplebook.h
wx/spinbutt.h
wx/spinctrl.h
wx/splitter.h
wx/vscroll.h
wx/xpmdecod.h
wx/xpmhand.h
+ wx/xrc/xmlreshandler.h
</set>
<!-- ====================================================================== -->
<!-- wxGTK -->
<!-- ====================================================================== -->
+<set var="GTK_WIN32_SRC" hints="files">
+ src/generic/caret.cpp
+ src/generic/imaglist.cpp
+ src/msw/ole/automtn.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/display.cpp
+ src/msw/utilswin.cpp
+ src/unix/fontenum.cpp
+ src/unix/fontutil.cpp
+</set>
+<set var="GTK_WIN32_HDR" hints="files">
+ wx/generic/caret.h
+ wx/generic/imaglist.h
+ wx/msw/ole/automtn.h
+ wx/msw/ole/oleutils.h
+ wx/msw/ole/safearray.h
+ wx/msw/ole/uuid.h
+ wx/msw/dib.h
+ wx/unix/fontutil.h
+</set>
+<set var="GTK_PLATFORM_SRC" hints="files">
+ <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+ <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_SRC)</if>
+</set>
+<set var="GTK_PLATFORM_HDR" hints="files">
+ <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+ <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_HDR)</if>
+</set>
<set var="GTK_LOWLEVEL_SRC" hints="files">
- $(XWIN_LOWLEVEL_SRC)
+ $(GTK_PLATFORM_SRC)
src/generic/icon.cpp
src/generic/paletteg.cpp
src/gtk/app.cpp
src/gtk/cursor.cpp
src/gtk/dataobj.cpp
src/gtk/dc.cpp
- src/gtk/dcclient.cpp
- src/gtk/dcmemory.cpp
- src/gtk/dcscreen.cpp
src/gtk/dnd.cpp
src/gtk/evtloop.cpp
src/gtk/filectrl.cpp
src/gtk/font.cpp
src/gtk/sockgtk.cpp
src/gtk/minifram.cpp
+ src/gtk/nonownedwnd.cpp
src/gtk/pen.cpp
src/gtk/popupwin.cpp
src/gtk/private.cpp
src/gtk/region.cpp
src/gtk/renderer.cpp
src/gtk/settings.cpp
+ src/gtk/textmeasure.cpp
src/gtk/timer.cpp
src/gtk/tooltip.cpp
src/gtk/toplevel.cpp
src/gtk/win_gtk.cpp
src/gtk/window.cpp
</set>
+<set var="GTK2_LOWLEVEL_SRC" hints="files">
+ $(GTK_LOWLEVEL_SRC)
+ src/gtk/dcclient.cpp
+ src/gtk/dcmemory.cpp
+ src/gtk/dcscreen.cpp
+</set>
<set var="GTK_LOWLEVEL_HDR" hints="files">
- $(XWIN_LOWLEVEL_HDR)
+ $(GTK_PLATFORM_HDR)
wx/generic/icon.h
wx/generic/paletteg.h
wx/gtk/app.h
wx/gtk/dataform.h
wx/gtk/dataobj.h
wx/gtk/dataobj2.h
- wx/gtk/dc.h
- wx/gtk/dcclient.h
- wx/gtk/dcmemory.h
- wx/gtk/dcscreen.h
wx/gtk/dnd.h
wx/gtk/evtloop.h
wx/gtk/evtloopsrc.h
wx/gtk/font.h
wx/gtk/filehistory.h
wx/gtk/minifram.h
+ wx/gtk/nonownedwnd.h
wx/gtk/pen.h
wx/gtk/popupwin.h
- wx/gtk/private/win_gtk.h
wx/gtk/region.h
wx/gtk/tooltip.h
wx/gtk/toplevel.h
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
- <!-- Generic implementations used by wxGPE: -->
- src/generic/fontdlgg.cpp
<!-- GTK+ specific files: -->
src/gtk/anybutton.cpp
src/gtk/artgtk.cpp
src/gtk/fontdlg.cpp
src/gtk/frame.cpp
src/gtk/gauge.cpp
- src/gtk/gnome/gprint.cpp
src/gtk/gnome/gvfs.cpp
src/gtk/infobar.cpp
src/gtk/listbox.cpp
src/gtk/tglbtn.cpp
src/gtk/treeentry_gtk.c
</set>
+<set var="GTK2_SRC" hints="files">
+ $(GTK_SRC)
+ <!-- Generic implementations used by wxGPE: -->
+ src/generic/fontdlgg.cpp
+ <!-- GTK+ specific files: -->
+ src/gtk/gnome/gprint.cpp
+</set>
<set var="GTK_HDR" hints="files">
wx/generic/fdrepdlg.h
wx/generic/filepickerg.h
- wx/generic/fontdlgg.h
wx/generic/listctrl.h
wx/generic/statusbr.h
wx/gtk/accel.h
wx/gtk/fontdlg.h
wx/gtk/frame.h
wx/gtk/gauge.h
- wx/gtk/gnome/gprint.h
wx/gtk/gnome/gvfs.h
wx/gtk/infobar.h
wx/gtk/listbox.h
wx/gtk/textctrl.h
wx/gtk/textentry.h
wx/gtk/tglbtn.h
- wx/gtk/treeentry_gtk.h
+</set>
+<set var="GTK2_HDR" hints="files">
+ $(GTK_HDR)
+ wx/generic/fontdlgg.h
+ wx/gtk/gnome/gprint.h
</set>
$(XWIN_LOWLEVEL_SRC)
src/generic/icon.cpp
src/generic/paletteg.cpp
+ src/generic/textmeasure.cpp
src/gtk1/app.cpp
src/gtk1/bitmap.cpp
src/gtk1/brush.cpp
<set var="MOTIF_LOWLEVEL_SRC" hints="files">
$(XWIN_LOWLEVEL_SRC)
+ src/generic/textmeasure.cpp
src/x11/bitmap.cpp
src/x11/brush.cpp
src/x11/palette.cpp
<set var="X11_LOWLEVEL_SRC" hints="files">
$(XWIN_LOWLEVEL_SRC)
src/generic/icon.cpp
+ src/generic/textmeasure.cpp
src/generic/timer.cpp
src/x11/app.cpp
src/x11/bitmap.cpp
src/msw/ole/dropsrc.cpp
src/msw/ole/droptgt.cpp
src/msw/ole/oleutils.cpp
+ src/msw/ole/safearray.cpp
src/msw/palette.cpp
src/msw/pen.cpp
src/msw/popupwin.cpp
src/msw/region.cpp
src/msw/renderer.cpp
src/msw/settings.cpp
+ src/msw/textmeasure.cpp
src/msw/tooltip.cpp
src/msw/toplevel.cpp
src/msw/uiaction.cpp
src/msw/utilsgui.cpp
+ src/msw/utilswin.cpp
src/msw/uxtheme.cpp
src/msw/window.cpp
</set>
src/msw/dialog.cpp
src/msw/dirdlg.cpp
src/msw/dragimag.cpp
+ src/msw/evtloop.cpp
src/msw/filedlg.cpp
src/msw/frame.cpp
src/msw/gauge.cpp
wx/msw/control.h
wx/msw/ctrlsub.h
wx/msw/cursor.h
+ wx/msw/custombgwin.h
wx/msw/dc.h
wx/msw/dcclient.h
wx/msw/dcmemory.h
wx/msw/icon.h
wx/msw/imaglist.h
wx/msw/iniconf.h
+ wx/msw/init.h
wx/msw/listbox.h
wx/msw/listctrl.h
wx/msw/mdi.h
wx/msw/ole/dropsrc.h
wx/msw/ole/droptgt.h
wx/msw/ole/oleutils.h
+ wx/msw/ole/safearray.h
wx/msw/ownerdrw.h
wx/msw/palette.h
wx/msw/panel.h
wx/msw/rcdefs.h
wx/msw/richmsgdlg.h
wx/msw/scrolbar.h
- wx/msw/setup0.h
wx/msw/slider.h
wx/msw/spinbutt.h
wx/msw/spinctrl.h
wx/msw/pencil.cur
wx/msw/pntleft.cur
wx/msw/pntright.cur
- wx/msw/rightarr.cur
wx/msw/roller.cur
<!-- icons -->
wx/msw/cdrom.ico
</set>
-<!-- ====================================================================== -->
-<!-- wxMGL -->
-<!-- ====================================================================== -->
-
-<set var="MGL_LOWLEVEL_SRC" hints="files">
- src/common/fontmgrcmn.cpp
- src/generic/caret.cpp
- src/generic/colour.cpp
- src/generic/icon.cpp
- src/generic/imaglist.cpp
- src/generic/mask.cpp
- src/generic/timer.cpp
- src/mgl/app.cpp
- src/mgl/bitmap.cpp
- src/mgl/brush.cpp
- src/mgl/clipbrd.cpp
- src/mgl/cursor.cpp
- src/mgl/data.cpp
- src/mgl/dc.cpp
- src/mgl/dcclient.cpp
- src/mgl/dcmemory.cpp
- src/mgl/dcscreen.cpp
- src/mgl/dirmgl.cpp
- src/mgl/evtloop.cpp
- src/mgl/font.cpp
- src/mgl/fontenum.cpp
- src/mgl/fontmgr.cpp
- src/mgl/fontutil.cpp
- src/mgl/palette.cpp
- src/mgl/pen.cpp
- src/mgl/region.cpp
- src/mgl/settings.cpp
- src/mgl/toplevel.cpp
- src/mgl/utils.cpp
- src/mgl/window.cpp
-</set>
-<set var="MGL_LOWLEVEL_HDR" hints="files">
- wx/generic/caret.h
- wx/generic/colour.h
- wx/generic/icon.h
- wx/generic/imaglist.h
- wx/generic/mask.h
- wx/mgl/app.h
- wx/mgl/bitmap.h
- wx/mgl/brush.h
- wx/mgl/chkconf.h
- wx/mgl/clipbrd.h
- wx/mgl/cursor.h
- wx/mgl/dc.h
- wx/mgl/dcclient.h
- wx/mgl/dcmemory.h
- wx/mgl/dcscreen.h
- wx/mgl/font.h
- wx/mgl/palette.h
- wx/mgl/pen.h
- wx/mgl/popupwin.h
- wx/mgl/private.h
- wx/mgl/region.h
- wx/mgl/toplevel.h
- wx/mgl/window.h
-</set>
-
-
<!-- ====================================================================== -->
<!-- wxDFB -->
<!-- ====================================================================== -->
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/mask.cpp
+ src/generic/textmeasure.cpp
src/dfb/app.cpp
src/dfb/bitmap.cpp
src/dfb/brush.cpp
src/generic/mdig.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
+ src/generic/textmeasure.cpp
<!-- OS/2 specific files: -->
src/os2/accel.cpp
src/os2/app.cpp
wx/os2/region.h
wx/os2/scrolbar.h
wx/os2/settings.h
- wx/os2/setup0.h
wx/os2/slider.h
wx/os2/spinbutt.h
wx/os2/spinctrl.h
src/osx/scrolbar_osx.cpp
src/osx/slider_osx.cpp
src/osx/spinbutt_osx.cpp
- src/osx/spinctrl_osx.cpp
src/osx/srchctrl_osx.cpp
src/osx/statbox_osx.cpp
src/osx/statline_osx.cpp
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
+ src/generic/textmeasure.cpp
</if>
</set>
wx/osx/scrolbar.h
wx/osx/slider.h
wx/osx/spinbutt.h
- wx/osx/spinctrl.h
wx/osx/srchctrl.h
wx/osx/statbmp.h
wx/osx/statbox.h
wx/osx/carbon/chkconf.h
wx/osx/carbon/evtloop.h
wx/osx/carbon/private.h
- wx/osx/carbon/private/mactext.h
- wx/osx/carbon/private/overlay.h
- wx/osx/carbon/private/print.h
wx/osx/carbon/region.h
wx/osx/carbon/statbmp.h
wx/osx/carbon/uma.h
src/osx/cocoa/nonownedwnd.mm
src/osx/cocoa/notebook.mm
src/osx/cocoa/radiobut.mm
+ src/osx/cocoa/preferences.mm
src/osx/cocoa/printdlg.mm
src/osx/cocoa/scrolbar.mm
src/osx/cocoa/slider.mm
src/generic/paletteg.cpp
src/generic/regiong.cpp
src/generic/statusbr.cpp
+ src/generic/textmeasure.cpp
</set>
<set var="COCOA_HDR" hints="files">
wx/cocoa/NSApplication.h
src/univ/themes/win32.cpp
</set>
+<set var="UNIV_PLATFORM_SRC" hints="files">
+ <if cond="TOOLKIT=='MSW'">
+ src/msw/evtloop.cpp
+ </if>
+</set>
+<set var="UNIV_PLATFORM_HDR" hints="files">
+ <if cond="TOOLKIT=='MSW'">
+ wx/msw/evtloop.h
+ </if>
+</set>
+
<set var="UNIV_SRC" hints="files">
+ $(UNIV_PLATFORM_SRC)
src/generic/accel.cpp
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
src/univ/winuniv.cpp
</set>
<set var="UNIV_HDR" hints="files">
+ $(UNIV_PLATFORM_HDR)
wx/generic/accel.h
wx/generic/animate.h
wx/generic/clrpickerg.h
wx/univ/colschem.h
wx/univ/combobox.h
wx/univ/control.h
+ wx/univ/custombgwin.h
wx/univ/dialog.h
wx/univ/frame.h
wx/univ/gauge.h
src/common/gridcmn.cpp
src/common/hyperlnkcmn.cpp
src/common/odcombocmn.cpp
+ src/common/richtooltipcmn.cpp
src/generic/aboutdlgg.cpp
src/generic/bannerwindow.cpp
src/generic/bmpcboxg.cpp
src/generic/notifmsgg.cpp
src/generic/odcombo.cpp
src/generic/propdlg.cpp
+ src/generic/richtooltipg.cpp
src/generic/sashwin.cpp
src/generic/splash.cpp
- src/generic/timectrl.cpp
+ src/generic/timectrlg.cpp
src/generic/tipdlg.cpp
src/generic/treelist.cpp
src/generic/wizard.cpp
wx/dataview.h
wx/datectrl.h
wx/dateevt.h
+ wx/datetimectrl.h
wx/dcbuffer.h
wx/dvrenderers.h
wx/editlbox.h
wx/notifmsg.h
wx/odcombo.h
wx/propdlg.h
+ wx/richtooltip.h
wx/sashwin.h
wx/sound.h
wx/splash.h
src/common/taskbarcmn.cpp
src/msw/aboutdlg.cpp
src/msw/notifmsg.cpp
+ src/msw/richtooltip.cpp
src/msw/sound.cpp
src/msw/taskbar.cpp
</set>
<set var="ADVANCED_OSX_COCOA_SRC" hints="files">
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
+ src/osx/datetimectrl_osx.cpp
+ src/osx/datectrl_osx.cpp
src/osx/sound_osx.cpp
+ src/osx/timectrl_osx.cpp
src/osx/carbon/sound.cpp
src/osx/core/sound.cpp
src/osx/cocoa/aboutdlg.mm
src/osx/dataview_osx.cpp
src/osx/cocoa/dataview.mm
+ src/osx/cocoa/datetimectrl.mm
src/osx/cocoa/taskbar.mm
src/osx/core/hidjoystick.cpp
</set>
<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
wx/generic/animate.h
wx/osx/dataview.h
+ wx/osx/datectrl.h
+ wx/osx/datetimectrl.h
wx/osx/dvrenderer.h
wx/osx/dvrenderers.h
wx/osx/joystick.h
wx/osx/sound.h
wx/osx/taskbarosx.h
+ wx/osx/timectrl.h
wx/osx/core/joystick.h
wx/osx/cocoa/dataview.h
</set>
wx/generic/animate.h
</set>
+<set var="ADVANCED_GTK_WIN32_SRC" hints="files">
+ src/common/taskbarcmn.cpp
+ src/msw/joystick.cpp
+ src/msw/sound.cpp
+</set>
+<set var="ADVANCED_GTK_WIN32_HDR" hints="files">
+ wx/msw/joystick.h
+ wx/msw/sound.h
+ wx/msw/taskbar.h
+</set>
+<set var="ADVANCED_GTK_PLATFORM_SRC" hints="files">
+ <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_SRC)</if>
+ <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_SRC)</if>
+</set>
+<set var="ADVANCED_GTK_PLATFORM_HDR" hints="files">
+ <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_HDR)</if>
+ <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_HDR)</if>
+</set>
<set var="ADVANCED_GTK_SRC" hints="files">
+ $(ADVANCED_GTK_PLATFORM_SRC)
+ src/gtk/notifmsg.cpp
src/gtk/taskbar.cpp
+</set>
+<set var="ADVANCED_GTK2_SRC" hints="files">
+ $(ADVANCED_GTK_SRC)
src/gtk/eggtrayicon.c
src/gtk/hildon/notifmsg.cpp
</set>
<set var="ADVANCED_GTK_HDR" hints="files">
- wx/gtk/hildon/notifmsg.h
+ $(ADVANCED_GTK_PLATFORM_HDR)
+ wx/gtk/notifmsg.h
wx/gtk/taskbar.h
</set>
+<set var="ADVANCED_GTK2_HDR" hints="files">
+ $(ADVANCED_GTK_HDR)
+ wx/gtk/hildon/notifmsg.h
+</set>
<set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
src/gtk/aboutdlg.cpp
</set>
<set var="ADVANCED_UNIV_SRC" hints="files">
- src/generic/animateg.cpp
+<!--
+ Including src/generic/animateg.cpp hre unconditionally results in bakefile
+ errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.
+-->
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+ src/generic/animateg.cpp
+ </if>
+ <if cond="TOOLKIT=='MSW'">
+ src/generic/animateg.cpp
+ </if>
+ <if cond="TOOLKIT=='WINCE'">
+ src/generic/animateg.cpp
+ </if>
+ <if cond="TOOLKIT=='X11'">
+ src/generic/animateg.cpp
+ </if>
</set>
<set var="ADVANCED_UNIV_HDR" hints="files">
wx/generic/animate.h
</set>
<set var="MEDIA_OSX_COCOA_SRC" hints="files">
- <!-- src/osx/cocoa/mediactrl.mm -->
+ src/osx/cocoa/mediactrl.mm
</set>
<set var="MEDIA_OSX_COCOA_HDR" hints="files">
</set>
<set var="WEBVIEW_SRC_PLATFORM">
<if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
- <if cond="PLATFORM_UNIX=='1'">src/gtk/webview_webkit.cpp</if>
+ <if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit.cpp</if>
<if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
</set>
<set var="WEBVIEW_SRC" hints="files">
$(WEBVIEW_SRC_PLATFORM)
src/common/webview.cpp
src/common/webviewarchivehandler.cpp
+ src/common/webviewfshandler.cpp
</set>
<set var="WEBVIEW_HDR_PLATFORM" hints="files">
<if cond="TOOLKIT=='MSW'">
wx/msw/webviewhistoryitem_ie.h
wx/msw/webview_ie.h
+ wx/msw/webview_missing.h
</if>
- <if cond="PLATFORM_UNIX=='1'">
+ <if cond="TOOLKIT=='GTK'">
wx/gtk/webviewhistoryitem_webkit.h
wx/gtk/webview_webkit.h
</if>
$(WEBVIEW_HDR_PLATFORM)
wx/webview.h
wx/webviewarchivehandler.h
+ wx/webviewfshandler.h
</set>
<!-- ====================================================================== -->
src/xrc/xh_propdlg.cpp
src/xrc/xh_radbt.cpp
src/xrc/xh_radbx.cpp
- <!-- disabled until linking problems are fixed -->
- <!-- src/xrc/xh_richtext.cpp -->
src/xrc/xh_scrol.cpp
src/xrc/xh_scwin.cpp
src/xrc/xh_htmllbox.cpp
wx/xrc/xh_propdlg.h
wx/xrc/xh_radbt.h
wx/xrc/xh_radbx.h
- <!-- wx/xrc/xh_richtext.h -->
wx/xrc/xh_scrol.h
wx/xrc/xh_scwin.h
wx/xrc/xh_htmllbox.h
<if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
<if cond="TOOLKIT=='OSX_IPHONE'">src/osx/iphone/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
<if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3' and PLATFORM_WIN32=='0'">
+ src/unix/glx11.cpp
+ src/gtk/glcanvas.cpp
+ </if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
src/gtk/glcanvas.cpp
src/unix/glx11.cpp
<if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h</if>
<if cond="TOOLKIT=='OSX_COCOA'">wx/osx/glcanvas.h</if>
<if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">
+ wx/gtk/glcanvas.h
+ wx/unix/glx11.h
+ </if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
wx/gtk/glcanvas.h
wx/unix/glx11.h
<!-- wxAUI -->
<!-- ====================================================================== -->
+<set var="AUI_GTK_SRC" hints="files">
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+ src/aui/tabartgtk.cpp
+ </if>
+</set>
+<set var="AUI_GTK_HDR" hints="files">
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+ wx/aui/tabartgtk.h
+ </if>
+</set>
<set var="AUI_SRC" hints="files">
src/aui/framemanager.cpp
src/aui/dockart.cpp
src/aui/auibook.cpp
src/aui/auibar.cpp
src/aui/tabmdi.cpp
+ src/aui/tabart.cpp
+ src/xrc/xh_auinotbk.cpp
+ $(AUI_GTK_SRC)
</set>
<set var="AUI_HDR" hints="files">
wx/aui/framemanager.h
wx/aui/auibar.h
wx/aui/tabmdi.h
wx/aui/aui.h
+ wx/aui/tabart.h
+ wx/xrc/xh_auinotbk.h
+ $(AUI_GTK_HDR)
</set>
<!-- ====================================================================== -->
src/ribbon/page.cpp
src/ribbon/panel.cpp
src/ribbon/toolbar.cpp
+ src/xrc/xh_ribbon.cpp
</set>
<set var="RIBBON_HDR" hints="files">
wx/ribbon/art.h
wx/ribbon/page.h
wx/ribbon/panel.h
wx/ribbon/toolbar.h
+ wx/xrc/xh_ribbon.h
</set>
<!-- ====================================================================== -->
src/richtext/richtextstyles.cpp
src/richtext/richtextsymboldlg.cpp
src/richtext/richtextxml.cpp
+ src/xrc/xh_richtext.cpp
</set>
<set var="RICHTEXT_HDR" hints="files">
wx/richtext/richtextbackgroundpage.h
wx/richtext/richtextstylepage.h
wx/richtext/richtextstyles.h
wx/richtext/richtextsymboldlg.h
+ wx/richtext/richtexttabspage.h
wx/richtext/richtextuicustomization.h
wx/richtext/richtextxml.h
+ wx/xrc/xh_richtext.h
</set>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
- <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
<if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
</set>
<set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
</set>
<set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
- <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
<if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
<!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
<!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>
- <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
<if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
</set>
<!-- GUI sources: -->
<set var="LOWLEVEL_SRC" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
- <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
</set>
<set var="LOWLEVEL_HDR" hints="files">
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
- <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
</set>
</set>
<set var="GUI_SRC" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
</set>
<set var="GUI_HDR" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
- <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
</set>
<set var="ADVANCED_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
- <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
</set>
<!-- wxAdv files not used by wxUniv -->
<set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_SRC)</if>
</set>
<set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
</set>
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
$(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
- $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEBVIEW_HDR}
+ $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_HDR)
</if>
</set>
$(BASE_UNIX_HDR)
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
$(BASE_OSX_HDR)
- $(BASE_PALMOS_HDR)
$(BASE_MSDOS_HDR)
$(NET_CMN_HDR)
$(XML_HDR)
$(BASE_OSX_SRC)
$(BASE_OS2_SRC)
$(BASE_MSDOS_SRC)
- $(BASE_PALMOS_SRC)
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_OSX_CARBON_SRC)
$(BASE_AND_GUI_OSX_COCOA_SRC)
projects / wxWidgets.git / blobdiff