<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<!-- UNIX -->
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<set var="BASE_UNIX_SRC" hints="files">
+
+<!-- Files used on all Unix systems, including Darwin -->
+<set var="BASE_UNIX_AND_DARWIN_SRC" hints="files">
src/common/fdiodispatcher.cpp
src/common/selectdispatcher.cpp
- src/unix/appunix.cpp
- src/unix/baseunix.cpp
- src/unix/dir.cpp
- src/unix/dlunix.cpp
src/unix/epolldispatcher.cpp
+ src/unix/appunix.cpp
src/unix/evtloopunix.cpp
- src/unix/mimetype.cpp
+ src/unix/dlunix.cpp
src/unix/snglinst.cpp
- src/unix/stackwalk.cpp
src/unix/stdpaths.cpp
- src/unix/threadpsx.cpp
src/unix/timerunx.cpp
-</set>
-<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
+ src/unix/stackwalk.cpp
src/unix/utilsunx.cpp
</set>
-<set var="BASE_UNIX_HDR" hints="files">
+
+<set var="BASE_UNIX_AND_DARWIN_HDR" hints="files">
wx/private/fdiodispatcher.h
wx/private/selectdispatcher.h
wx/unix/app.h
wx/unix/apptbase.h
wx/unix/apptrait.h
wx/unix/chkconf.h
- wx/unix/execute.h
wx/unix/evtloop.h
- wx/unix/mimetype.h
wx/unix/pipe.h
- wx/unix/private.h
- wx/unix/stackwalk.h
wx/unix/stdpaths.h
+ wx/unix/stackwalk.h
+</set>
+
+<!--
+ Files used on all Unix systems, including Darwin with any port but wxMac
+ (this is really an aberration, we should also use these files for wxMac,
+ it's not done because of some OS 9 support leftovers only now)
+ -->
+<set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC" hints="files">
+ $(BASE_UNIX_AND_DARWIN_SRC)
+ src/unix/dir.cpp
+ src/unix/mimetype.cpp
+ src/unix/threadpsx.cpp
+</set>
+
+<set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR" hints="files">
+ $(BASE_UNIX_AND_DARWIN_HDR)
+ wx/unix/execute.h
+ wx/unix/mimetype.h
+ wx/unix/private.h
+</set>
+
+<!--
+ Files used on all non-Darwin Unix systems (because Darwin provides other,
+ better, native equivalents of the functionality they implement (e.g.
+ CFSocket instead of BSD sockets) or doesn't provide it at all (epoll,
+ backtrace())
+ -->
+<set var="BASE_UNIX_SRC" hints="files">
+ $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
+ src/common/gsocketiohandler.cpp
+</set>
+<set var="BASE_UNIX_HDR" hints="files">
+ $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
+ wx/private/gsocketiohandler.h
</set>
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<!-- Used on Mac OS CarbonLib, Mac OS X wxMac base, and Mac OS X darwin base -->
<set var="BASE_COREFOUNDATION_SRC" hints="files">
src/mac/corefoundation/cfstring.cpp
+ src/mac/corefoundation/gsockosx.cpp
src/mac/corefoundation/stdpaths_cf.cpp
src/mac/corefoundation/strconv_cf.cpp
src/mac/corefoundation/utilsexc_base.cpp
<!-- Base files used only by OS X builds (not CarbonLib or Classic) -->
<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
$(BASE_MAC_SRC)
- src/common/fdiodispatcher.cpp
- src/common/selectdispatcher.cpp
- src/unix/appunix.cpp
- src/unix/baseunix.cpp
- src/unix/evtloopunix.cpp
- src/unix/dlunix.cpp
- src/unix/snglinst.cpp
- src/unix/stdpaths.cpp
- src/unix/timerunx.cpp
+ $(BASE_UNIX_AND_DARWIN_SRC)
</set>
<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
$(BASE_MAC_HDR)
- wx/private/fdiodispatcher.h
- wx/private/selectdispatcher.h
- wx/unix/app.h
- wx/unix/apptbase.h
- wx/unix/apptrait.h
- wx/unix/chkconf.h
- wx/unix/evtloop.h
- wx/unix/pipe.h
- wx/unix/stdpaths.h
+ $(BASE_UNIX_AND_DARWIN_HDR)
</set>
<!-- Base files used by non-wxMac OS X builds -->
<set var="BASE_MACOSX_NOTWXMAC_SRC" hints="files">
- $(BASE_UNIX_SRC)
+ $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
$(BASE_COREFOUNDATION_SRC)
</set>
<set var="BASE_MACOSX_NOTWXMAC_HDR" hints="files">
- $(BASE_UNIX_HDR)
+ $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
$(BASE_COREFOUNDATION_HDR)
</set>
<set var="BASE_OS2_SRC" hints="files">
src/common/fdiodispatcher.cpp
src/common/selectdispatcher.cpp
+ src/common/gsocketiohandler.cpp
src/unix/appunix.cpp
src/unix/evtloopunix.cpp
src/unix/timerunx.cpp
<set var="BASE_OS2_HDR" hints="files">
wx/private/fdiodispatcher.h
wx/private/selectdispatcher.h
+ wx/private/gsocketiohandler.h
wx/unix/app.h
wx/os2/apptbase.h
wx/os2/apptrait.h
src/common/wfstream.cpp
src/common/wxcrt.cpp
src/common/wxprintf.cpp
+ src/common/xlocale.cpp
src/common/xti.cpp
src/common/xtistrm.cpp
src/common/zipstrm.cpp
wx/power.h
wx/process.h
wx/ptr_scpd.h
+ wx/ptr_shrd.h
wx/recguard.h
wx/regex.h
wx/scopeguard.h
wx/thrimpl.cpp
wx/timer.h
wx/tokenzr.h
+ wx/tracker.h
wx/txtstrm.h
wx/types.h
wx/unichar.h
wx/vector.h
wx/version.h
wx/volume.h
+ wx/weakref.h
wx/wfstream.h
wx/wx.h
wx/wxchar.h
wx/wxcrtbase.h
wx/wxcrtvararg.h
wx/wxprec.h
+ wx/xlocale.h
wx/xti.h
wx/xtistrm.h
wx/zipstrm.h
wx/zstream.h
+ wx/meta/convertible.h
+ wx/meta/if.h
+ wx/meta/int2type.h
+ wx/meta/movable.h
</set>
<set var="NET_WIN32_SRC" hints="files">
src/msw/gsocket.cpp
+ src/msw/gsockmsw.cpp
src/msw/urlmsw.cpp
</set>
<set var="NET_WIN32_HDR" hints="files">
src/common/validate.cpp
src/common/valtext.cpp
src/common/wincmn.cpp
+ src/common/windowid.cpp
src/common/xpmdecod.cpp
src/generic/busyinfo.cpp
src/generic/buttonbar.cpp
wx/mdi.h
wx/menu.h
wx/msgdlg.h
+ wx/nativewin.h
wx/numdlg.h
wx/overlay.h
wx/palette.h
wx/validate.h
wx/valtext.h
wx/window.h
+ wx/windowid.h
wx/wupdlock.h
wx/accel.h
wx/access.h
wx/anidecod.h
+ wx/animdecod.h
wx/artprov.h
wx/bitmap.h
wx/bookctrl.h
wx/printdlg.h
wx/prntbase.h
wx/progdlg.h
- wx/ptr_scpd.h
wx/quantize.h
wx/rawbmp.h
wx/region.h
wx/xpmhand.h
</set>
+<!-- ====================================================================== -->
+<!-- Common Unix files: -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SRC" hints="files">
+ src/unix/apptraits.cpp
+</set>
<!-- ====================================================================== -->
<!-- Common X11 code: -->
wx/gtk/minifram.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
- wx/gtk/win_gtk.h
wx/gtk/window.h
</set>
<set var="GTK_SRC" hints="files">
src/gtk/menu.cpp
src/gtk/mnemonics.cpp
src/gtk/msgdlg.cpp
+ src/gtk/nativewin.cpp
src/gtk/notebook.cpp
src/gtk/radiobox.cpp
src/gtk/radiobut.cpp
<set var="X11_LOWLEVEL_SRC" hints="files">
$(XWIN_LOWLEVEL_SRC)
- src/common/gsocketiohandler.cpp
src/generic/icon.cpp
src/generic/timer.cpp
src/x11/app.cpp
src/msw/gdiobj.cpp
src/msw/gdiplus.cpp
src/msw/graphics.cpp
- src/msw/gsockmsw.cpp
src/msw/icon.cpp
src/msw/imaglist.cpp
src/msw/minifram.cpp
src/msw/dragimag.cpp
src/msw/filedlg.cpp
src/msw/frame.cpp
- src/msw/gauge95.cpp
+ src/msw/gauge.cpp
src/msw/iniconf.cpp
src/msw/listbox.cpp
src/msw/listctrl.cpp
src/msw/metafile.cpp
src/msw/msgdlg.cpp
src/msw/nativdlg.cpp
+ src/msw/nativewin.cpp
src/msw/notebook.cpp
src/msw/ole/access.cpp
src/msw/ownerdrw.cpp
src/msw/radiobox.cpp
src/msw/radiobut.cpp
src/msw/scrolbar.cpp
- src/msw/slider95.cpp
+ src/msw/slider.cpp
src/msw/spinbutt.cpp
src/msw/spinctrl.cpp
src/msw/statbmp.cpp
src/msw/statbox.cpp
- src/msw/statbr95.cpp
+ src/msw/statusbar.cpp
src/msw/statline.cpp
src/msw/stattext.cpp
src/msw/tabctrl.cpp
- src/msw/tbar95.cpp
+ src/msw/toolbar.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
src/msw/tglbtn.cpp
wx/msw/filedlg.h
wx/msw/font.h
wx/msw/frame.h
- wx/msw/gauge95.h
+ wx/msw/gauge.h
wx/msw/gdiimage.h
wx/msw/icon.h
wx/msw/imaglist.h
wx/msw/rcdefs.h
wx/msw/scrolbar.h
wx/msw/setup0.h
- wx/msw/slider95.h
+ wx/msw/slider.h
wx/msw/spinbutt.h
wx/msw/spinctrl.h
wx/msw/statbmp.h
wx/msw/statbox.h
- wx/msw/statbr95.h
+ wx/msw/statusbar.h
wx/msw/statline.h
wx/msw/stattext.h
wx/msw/tabctrl.h
- wx/msw/tbar95.h
+ wx/msw/toolbar.h
wx/msw/textctrl.h
wx/msw/textentry.h
wx/msw/tglbtn.h
<set var="DFB_LOWLEVEL_SRC" hints="files">
src/common/fontmgrcmn.cpp
- src/common/gsocketiohandler.cpp
src/generic/caret.cpp
src/generic/colour.cpp
src/generic/icon.cpp
src/os2/menu.cpp
src/os2/menuitem.cpp
src/os2/metafile.cpp
+ src/os2/minifram.cpp
src/os2/msgdlg.cpp
src/os2/nativdlg.cpp
src/os2/notebook.cpp
<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
<!-- Shared wxMac and wxCocoa files -->
- src/mac/corefoundation/gsockosx.cpp
src/mac/corefoundation/hid.cpp
src/mac/corefoundation/utilsexc_cf.cpp
</set>
src/mac/carbon/metafile.cpp
src/mac/carbon/minifram.cpp
src/mac/carbon/msgdlg.cpp
+ src/mac/carbon/nonownedwnd.cpp
src/mac/carbon/notebmac.cpp
src/mac/carbon/overlay.cpp
src/mac/carbon/palette.cpp
wx/mac/mimetype.h
wx/mac/minifram.h
wx/mac/msgdlg.h
+ wx/mac/nonownedwnd.h
wx/mac/notebook.h
wx/mac/palette.h
wx/mac/pen.h
+ wx/mac/popupwin.h
wx/mac/pnghand.h
wx/mac/pngread.h
wx/mac/printdlg.h
wx/mac/carbon/mimetype.h
wx/mac/carbon/minifram.h
wx/mac/carbon/msgdlg.h
+ wx/mac/carbon/nonownedwnd.h
wx/mac/carbon/notebook.h
wx/mac/carbon/palette.h
wx/mac/carbon/pen.h
+ wx/mac/carbon/popupwin.h
wx/mac/carbon/pnghand.h
wx/mac/carbon/pngread.h
wx/mac/carbon/printdlg.h
<set var="COCOA_LOWLEVEL_SRC" hints="files">
<!-- Shared wxMac and wxCocoa files -->
- src/mac/corefoundation/gsockosx.cpp
src/mac/corefoundation/hid.cpp
src/mac/corefoundation/utilsexc_cf.cpp
</set>
<set var="ADVANCED_CMN_SRC" hints="files">
src/common/animatecmn.cpp
+ src/common/calctrlcmn.cpp
src/common/datavcmn.cpp
src/common/hyperlnkcmn.cpp
src/generic/aboutdlgg.cpp
src/generic/bmpcboxg.cpp
- src/generic/calctrl.cpp
+ src/generic/calctrlg.cpp
src/generic/datavgen.cpp
src/generic/datectlg.cpp
src/generic/editlbox.cpp
<set var="ADVANCED_CMN_HDR" hints="files">
wx/aboutdlg.h
wx/animate.h
- wx/animdecod.h
wx/bmpcbox.h
wx/calctrl.h
wx/dataview.h
wx/editlbox.h
wx/generic/aboutdlgg.h
wx/generic/bmpcbox.h
- wx/generic/calctrl.h
+ wx/generic/calctrlg.h
wx/generic/datectrl.h
wx/generic/dataview.h
wx/generic/grid.h
<!-- not used with wxUniv -->
<set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+ src/msw/calctrl.cpp
+ src/msw/datecontrols.cpp
src/msw/datectrl.cpp
</set>
<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+ wx/msw/calctrl.h
+ wx/msw/datecontrols.h
wx/msw/datectrl.h
</set>
<set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
src/gtk/aboutdlg.cpp
src/gtk/animate.cpp
+ src/gtk/calctrl.cpp
src/gtk/dataview.cpp
src/gtk/hyperlink.cpp
</set>
<set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
wx/gtk/animate.h
+ wx/gtk/calctrl.h
wx/gtk/dataview.h
wx/gtk/hyperlink.h
</set>
<if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
</set>
<set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
- <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
- <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_UNIX_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="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
</set>
+ <set var="PLATFORM_SRC" hints="files">
+ <if cond="PLATFORM_UNIX=='1'">$(UNIX_SRC)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(UNIX_SRC)</if>
+ </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==''">$(GTK1_SRC)</if>
<set var="CORE_SRC" hints="files">
<if cond="USE_GUI=='1' and WXUNIV=='0'">
- $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
+ $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
</if>
<if cond="USE_GUI=='1' and WXUNIV=='1'">
- $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
+ $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
</if>
</set>
$(BASE_MSDOS_SRC)
$(BASE_PALMOS_SRC)
$(BASE_AND_GUI_CMN_SRC)
- $(BASE_AND_GUI_UNIX_SRC)
$(BASE_AND_GUI_MAC_SRC)
$(BASE_AND_GUI_WIN32_SRC)
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)