src/unix/epolldispatcher.cpp
src/unix/appunix.cpp
src/unix/evtloopunix.cpp
+ src/unix/dir.cpp
src/unix/dlunix.cpp
src/unix/snglinst.cpp
src/unix/stdpaths.cpp
src/unix/timerunx.cpp
+ src/unix/threadpsx.cpp
src/unix/stackwalk.cpp
src/unix/utilsunx.cpp
</set>
-->
<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">
<!-- Mac -->
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<!-- Used on Mac OS CarbonLib, Mac OS X wxMac base, and Mac OS X darwin base -->
+<!-- Used on Mac OS X wxMac base, and Mac OS X darwin base -->
<set var="BASE_COREFOUNDATION_SRC" hints="files">
src/osx/core/cfstring.cpp
src/osx/core/gsockosx.cpp
wx/osx/core/private/strconv_cf.h
</set>
-<!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
+<!-- Base files used by wxMac on OS X -->
<!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC -->
<set var="BASE_MAC_SRC" hints="files">
- src/osx/carbon/dirmac.cpp
src/osx/carbon/mimetmac.cpp
- src/osx/carbon/thread.cpp
- <!-- One would think MoreFilesX is only for OS X but it seems to
- apply to CarbonLib as well (FSRefMakeFSSpec) -->
- src/osx/carbon/morefilex/MoreFilesX.c
$(BASE_COREFOUNDATION_SRC)
</set>
<set var="BASE_MAC_HDR" hints="files">
$(BASE_COREFOUNDATION_HDR)
</set>
-<!-- Base and GUI files used by both OS X and CarbonLib -->
+<!-- Base and GUI files used by OS X -->
<set var="BASE_AND_GUI_MAC_SRC" hints="files">
src/osx/carbon/utils.cpp
src/osx/carbon/uma.cpp
</set>
-<!-- Base files used by Classic (not CarbonLib or OS X builds) -->
-<!-- set var="BASE_MAC_CLASSIC_SRC">
-</set -->
-<!-- set var="BASE_MAC_CLASSIC_HDR">
-</set -->
-
-<!-- Base files used only by CarbonLib builds (not Classic or OS X) -->
-<set var="BASE_MAC_CARBONLIB_SRC" hints="files">
- src/osx/carbon/morefile/DirectoryCopy.c
- src/osx/carbon/morefile/FSpCompat.c
- src/osx/carbon/morefile/FileCopy.c
- src/osx/carbon/morefile/FullPath.c
- src/osx/carbon/morefile/IterateDirectory.c
- src/osx/carbon/morefile/MoreDesktopMgr.c
- src/osx/carbon/morefile/MoreFiles.c
- src/osx/carbon/morefile/MoreFilesExtras.c
- src/osx/carbon/morefile/Search.c
-</set>
-<!-- set var="BASE_MAC_CARBONLIB_HDR" hints="files">
-</set -->
-
-<!-- Base files used only by OS X builds (not CarbonLib or Classic) -->
+<!-- Base files used only by OS X builds -->
<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
$(BASE_MAC_SRC)
$(BASE_UNIX_AND_DARWIN_SRC)
<set var="NET_OS2_HDR" hints="files">
wx/unix/gsockunx.h
</set>
-<!-- Net files used only by CarbonLib (not Classic or OS X) -->
-<set var="NET_MAC_CARBONLIB_SRC" hints="files">
-</set>
-<set var="NET_MAC_CARBONLIB_HDR" hints="files">
-</set>
<set var="NET_CMN_SRC" hints="files">
src/common/fs_inet.cpp
src/gtk/minifram.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
<set var="MAC_SRC" hints="files">
<!-- osx common files -->
+ src/osx/accel.cpp
+ src/osx/artmac.cpp
src/osx/brush.cpp
+ src/osx/fontutil.cpp
+ src/osx/imaglist.cpp
+ src/osx/minifram.cpp
+ src/osx/palette.cpp
src/osx/pen.cpp
<!-- core files -->
+ src/osx/core/bitmap.cpp
src/osx/core/colour.cpp
+ src/osx/core/dcmemory.cpp
+ src/osx/core/display.cpp
+ src/osx/core/fontenum.cpp
+ src/osx/core/printmac.cpp
src/osx/core/timer.cpp
<!-- carbon files -->
- src/osx/carbon/accel.cpp
src/osx/carbon/app.cpp
- src/osx/carbon/artmac.cpp
- src/osx/carbon/bitmap.cpp
src/osx/carbon/bmpbuttn.cpp
src/osx/carbon/button.cpp
src/osx/carbon/checkbox.cpp
src/osx/carbon/cursor.cpp
src/osx/carbon/dataobj.cpp
src/osx/carbon/dcclient.cpp
- src/osx/carbon/dcmemory.cpp
src/osx/carbon/dcprint.cpp
src/osx/carbon/dcscreen.cpp
src/osx/carbon/dialog.cpp
src/osx/carbon/dirdlg.cpp
- src/osx/carbon/display.cpp
src/osx/carbon/dnd.cpp
src/osx/carbon/evtloop.cpp
src/osx/carbon/filedlg.cpp
src/osx/carbon/font.cpp
src/osx/carbon/fontdlg.cpp
- src/osx/carbon/fontenum.cpp
- src/osx/carbon/fontutil.cpp
src/osx/carbon/frame.cpp
src/osx/carbon/gauge.cpp
src/osx/carbon/gdiobj.cpp
src/osx/carbon/graphics.cpp
src/osx/carbon/icon.cpp
- src/osx/carbon/imaglist.cpp
src/osx/carbon/listbox.cpp
src/osx/carbon/listctrl_mac.cpp
src/osx/carbon/mdi.cpp
src/osx/carbon/menu.cpp
src/osx/carbon/menuitem.cpp
src/osx/carbon/metafile.cpp
- src/osx/carbon/minifram.cpp
src/osx/carbon/msgdlg.cpp
src/osx/carbon/nonownedwnd.cpp
src/osx/carbon/notebmac.cpp
src/osx/carbon/overlay.cpp
- src/osx/carbon/palette.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/printdlg.cpp
- src/osx/carbon/printmac.cpp
src/osx/carbon/radiobox.cpp
src/osx/carbon/radiobut.cpp
src/osx/carbon/region.cpp
src/xrc/xh_unkwn.cpp
src/xrc/xh_wizrd.cpp
src/xrc/xmlres.cpp
+ src/xrc/xmladv.cpp
src/xrc/xmlrsall.cpp
</set>
<set var="XRC_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
- <if cond="PLATFORM_MACOS=='1'">$(BASE_MAC_SRC) $(BASE_MAC_CARBONLIB_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>
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC)</if>
- <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
</set>
<set var="NET_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
- <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_HDR)</if>
</set>
<set var="NET_SRC" hints="files">
$(NET_WIN32_HDR) $(NET_WINCE_HDR)
$(NET_OS2_HDR)
$(NET_UNIX_HDR)
- $(NET_MAC_CARBONLIB_HDR)
$(XML_HDR)
</set>