X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fd9ac06af890f1ea299bc31b1fe1dce5528980d..fe6b1b853aaa900356d12f69e8e3d84467221f4c:/build/bakefiles/files.bkl
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0af306acce..a42a93fe19 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -61,10 +61,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -80,6 +82,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/unix/pipe.h
wx/unix/stdpaths.h
wx/unix/stackwalk.h
+ wx/unix/tls.h
$(BASE_UNIX_AND_DARWIN_SRC)
- src/unix/dir.cpp
src/unix/mimetype.cpp
- src/unix/threadpsx.cpp
@@ -180,7 +181,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
+
src/osx/core/cfstring.cpp
src/osx/core/gsockosx.cpp
@@ -193,67 +194,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/core/cfref.h
wx/osx/core/cfstring.h
wx/osx/core/hid.h
+ wx/osx/core/private.h
wx/osx/core/stdpaths.h
wx/osx/core/private/strconv_cf.h
-
-
-
- src/osx/carbon/dirmac.cpp
- src/osx/carbon/mimetmac.cpp
- src/osx/carbon/thread.cpp
-
- src/osx/carbon/morefilex/MoreFilesX.c
+
+
+ src/osx/core/mimetype.cpp
$(BASE_COREFOUNDATION_SRC)
+ $(BASE_UNIX_AND_DARWIN_SRC)
-
+
$(BASE_COREFOUNDATION_HDR)
+ $(BASE_UNIX_AND_DARWIN_HDR)
-
-
+
+
src/osx/carbon/utils.cpp
src/osx/carbon/uma.cpp
-
-
-
-
-
-
- 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
-
-
-
-
-
- $(BASE_MAC_SRC)
- $(BASE_UNIX_AND_DARWIN_SRC)
-
-
- $(BASE_MAC_HDR)
- $(BASE_UNIX_AND_DARWIN_HDR)
+
+ src/osx/cocoa/utils.mm
-
+
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
$(BASE_COREFOUNDATION_SRC)
-
+
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
$(BASE_COREFOUNDATION_HDR)
@@ -455,6 +426,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/defs.h
wx/dir.h
wx/dlimpexp.h
+ wx/dlist.h
wx/dynarray.h
wx/dynlib.h
wx/dynload.h
@@ -486,6 +458,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/ioswrap.h
wx/ipc.h
wx/ipcbase.h
+ wx/kbdstate.h
wx/link.h
wx/list.h
wx/listimpl.cpp
@@ -497,6 +470,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/memtext.h
wx/mimetype.h
wx/module.h
+ wx/mousestate.h
wx/msgout.h
wx/mstream.h
wx/object.h
@@ -594,11 +568,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/unix/gsockunx.h
-
-
-
-
-
src/common/fs_inet.cpp
@@ -860,6 +829,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/textctrl.h
wx/textdlg.h
wx/textentry.h
+ wx/tls.h
wx/toolbar.h
wx/validate.h
wx/valtext.h
@@ -1028,6 +998,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -2182,114 +2153,147 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
+
+
+ src/osx/accel.cpp
+ src/osx/artmac.cpp
+ src/osx/bmpbuttn_osx.cpp
+ src/osx/brush.cpp
+ src/osx/button_osx.cpp
+ src/osx/checkbox_osx.cpp
+ src/osx/checklst_osx.cpp
+ src/osx/choice_osx.cpp
+ src/osx/dialog_osx.cpp
+ src/osx/fontutil.cpp
+ src/osx/gauge_osx.cpp
+ src/osx/imaglist.cpp
+ src/osx/listbox_osx.cpp
+ src/osx/menu_osx.cpp
+ src/osx/menuitem_osx.cpp
+ src/osx/minifram.cpp
+ src/osx/nonownedwnd_osx.cpp
+ src/osx/notebook_osx.cpp
+ src/osx/palette.cpp
+ src/osx/pen.cpp
+ src/osx/radiobox_osx.cpp
+ src/osx/radiobut_osx.cpp
+ 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/osx/stattext_osx.cpp
+ src/osx/tabctrl_osx.cpp
+ src/osx/textctrl_osx.cpp
+ src/osx/tglbtn_osx.cpp
+ src/osx/toolbar_osx.cpp
+ src/osx/toplevel_osx.cpp
+ src/osx/utils_osx.cpp
+
+ src/osx/window_osx.cpp
+
+ 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/hid.cpp
+ src/osx/core/printmac.cpp
+ src/osx/core/timer.cpp
src/osx/core/utilsexc_cf.cpp
+
-
+
-
- $(MAC_OSX_LOWLEVEL_SRC)
+
-
+
- src/html/htmlctrl/webkit/webkit.mm
+
- src/osx/carbon/fontdlgosx.mm
src/osx/carbon/colordlgosx.mm
+ src/osx/carbon/fontdlgosx.mm
+
+ src/osx/carbon/clipbrd.cpp
+ src/osx/carbon/cursor.cpp
+ src/osx/carbon/fontdlg.cpp
+ src/osx/carbon/gdiobj.cpp
+ src/osx/carbon/icon.cpp
+ src/osx/carbon/app.cpp
+ src/osx/carbon/combobox.cpp
+ src/osx/carbon/control.cpp
+ src/osx/carbon/dataobj.cpp
+ src/osx/carbon/dcclient.cpp
+ src/osx/carbon/dcprint.cpp
+ src/osx/carbon/dcscreen.cpp
+ src/osx/carbon/graphics.cpp
+ src/osx/carbon/dnd.cpp
+ src/osx/carbon/font.cpp
+ src/osx/carbon/frame.cpp
+ src/osx/carbon/mdi.cpp
+ src/osx/carbon/metafile.cpp
+ src/osx/carbon/overlay.cpp
+ src/osx/carbon/popupwin.cpp
+ src/osx/carbon/printdlg.cpp
+ src/osx/carbon/renderer.cpp
+ src/osx/carbon/settings.cpp
+ src/osx/carbon/statbrma.cpp
+ src/osx/carbon/tabctrl.cpp
src/osx/carbon/utilscocoa.mm
-
-
- src/osx/brush.cpp
- src/osx/pen.cpp
-
- src/osx/core/colour.cpp
- src/osx/core/timer.cpp
+
- src/osx/carbon/accel.cpp
- src/osx/carbon/app.cpp
- src/osx/carbon/artmac.cpp
- src/osx/carbon/bitmap.cpp
+ $(OSX_CARBON_COCOA_SRC)
src/osx/carbon/bmpbuttn.cpp
src/osx/carbon/button.cpp
src/osx/carbon/checkbox.cpp
- src/osx/carbon/checklst.cpp
src/osx/carbon/choice.cpp
- src/osx/carbon/clipbrd.cpp
src/osx/carbon/colordlg.cpp
- src/osx/carbon/combobox.cpp
- src/osx/carbon/control.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/osx/carbon/renderer.cpp
src/osx/carbon/scrolbar.cpp
- src/osx/carbon/settings.cpp
src/osx/carbon/slider.cpp
src/osx/carbon/spinbutt.cpp
- src/osx/carbon/spinctrl.cpp
src/osx/carbon/srchctrl.cpp
src/osx/carbon/statbmp.cpp
src/osx/carbon/statbox.cpp
- src/osx/carbon/statbrma.cpp
src/osx/carbon/statlmac.cpp
src/osx/carbon/stattext.cpp
- src/osx/carbon/tabctrl.cpp
src/osx/carbon/textctrl.cpp
src/osx/carbon/tglbtn.cpp
src/osx/carbon/toolbar.cpp
src/osx/carbon/tooltip.cpp
- src/osx/carbon/toplevel.cpp
src/osx/carbon/window.cpp
+
+ src/html/htmlctrl/webkit/webkit.mm
src/generic/caret.cpp
src/generic/clrpickerg.cpp
@@ -2305,7 +2309,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
+
wx/osx/accel.h
wx/osx/app.h
wx/osx/bitmap.h
@@ -2386,7 +2390,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/window.h
-
+
wx/osx/core/colour.h
@@ -2482,6 +2486,69 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/html/webkit.h
+
+
+
+
+
+ $(OSX_CARBON_COCOA_SRC)
+ src/osx/cocoa/bmpbuttn.mm
+ src/osx/cocoa/button.mm
+ src/osx/cocoa/checkbox.mm
+ src/osx/cocoa/choice.mm
+ src/osx/cocoa/dialog.mm
+ src/osx/cocoa/dirdlg.mm
+ src/osx/cocoa/evtloop.mm
+ src/osx/cocoa/filedlg.mm
+ src/osx/cocoa/gauge.mm
+ src/osx/cocoa/listbox.mm
+ src/osx/cocoa/menu.mm
+ src/osx/cocoa/menuitem.mm
+ src/osx/cocoa/msgdlg.mm
+ src/osx/cocoa/nonownedwnd.mm
+ src/osx/cocoa/notebook.mm
+ src/osx/cocoa/radiobut.mm
+ src/osx/cocoa/scrolbar.mm
+ src/osx/cocoa/slider.mm
+ src/osx/cocoa/spinbutt.mm
+ src/osx/cocoa/srchctrl.mm
+ src/osx/cocoa/statbox.mm
+ src/osx/cocoa/statline.mm
+ src/osx/cocoa/stattext.mm
+ src/osx/cocoa/textctrl.mm
+ src/osx/cocoa/tglbtn.mm
+ src/osx/cocoa/toolbar.mm
+ src/osx/cocoa/tooltip.mm
+ src/osx/cocoa/window.mm
+ src/generic/caret.cpp
+ src/generic/clrpickerg.cpp
+ src/generic/collpaneg.cpp
+ src/generic/fdrepdlg.cpp
+ src/generic/filepickerg.cpp
+ src/generic/fontdlgg.cpp
+ src/generic/fontpickerg.cpp
+ src/generic/listctrl.cpp
+ src/generic/prntdlgg.cpp
+ src/generic/regiong.cpp
+ src/generic/statusbr.cpp
+ src/generic/tabg.cpp
+
+
+ wx/osx/cocoa/chkconf.h
+ wx/osx/cocoa/private.h
+ $(OSX_CARBON_HDR)
+ wx/generic/region.h
+
+
+
+
+
+
+
+src/osx/iphone/nonownedwnd.mm
+src/osx/iphone/utils.mm
+src/osx/iphone/window.mm
+
@@ -2911,7 +2978,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/joystick.h
-
+
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/carbon/aboutdlg.cpp
@@ -2922,7 +2989,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/carbon/taskbar.cpp
src/osx/core/hidjoystick.cpp
-
+
+
wx/generic/animate.h
wx/osx/dataview.h
wx/osx/joystick.h
@@ -2935,12 +3003,34 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/core/joystick.h
+
+ src/common/taskbarcmn.cpp
+ src/generic/animateg.cpp
+ src/osx/cocoa/aboutdlg.mm
+ src/osx/cocoa/taskbar.mm
+ src/osx/core/hidjoystick.cpp
+
+
+
+ wx/generic/animate.h
+ wx/osx/dataview.h
+ wx/osx/joystick.h
+ wx/osx/sound.h
+
+
+
+ wx/osx/carbon/sound.h
+ wx/osx/carbon/taskbarosx.h
+ wx/osx/core/joystick.h
+
+
src/cocoa/taskbar.mm
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/core/hidjoystick.cpp
+
wx/cocoa/taskbar.h
wx/generic/animate.h
@@ -3046,10 +3136,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
+
src/osx/carbon/mediactrl.cpp
-
+
+
+
+
+
+
+
@@ -3207,6 +3303,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_unkwn.cpp
src/xrc/xh_wizrd.cpp
src/xrc/xmlres.cpp
+ src/xrc/xmladv.cpp
src/xrc/xmlrsall.cpp
@@ -3292,7 +3389,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- src/osx/carbon/glcanvas.cpp
+ src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp
+ src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp
src/cocoa/glcanvas.mm
src/gtk/glcanvas.cpp
@@ -3315,7 +3413,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h
+ wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h
wx/cocoa/glcanvas.h
wx/gtk/glcanvas.h
@@ -3354,6 +3452,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/aui/dockart.cpp
src/aui/floatpane.cpp
src/aui/auibook.cpp
+ src/aui/auibar.cpp
src/aui/tabmdi.cpp
@@ -3361,10 +3460,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/aui/dockart.h
wx/aui/floatpane.h
wx/aui/auibook.h
+ wx/aui/auibar.h
wx/aui/tabmdi.h
wx/aui/aui.h
+
+
+
+
+
+ src/propgrid/advprops.cpp
+ src/propgrid/editors.cpp
+ src/propgrid/manager.cpp
+ src/propgrid/property.cpp
+ src/propgrid/propgrid.cpp
+ src/propgrid/propgridiface.cpp
+ src/propgrid/propgridpagestate.cpp
+ src/propgrid/props.cpp
+
+
+ wx/propgrid/advprops.h
+ wx/propgrid/editors.h
+ wx/propgrid/manager.h
+ wx/propgrid/property.h
+ wx/propgrid/propgrid.h
+ wx/propgrid/propgriddefs.h
+ wx/propgrid/propgridiface.h
+ wx/propgrid/propgridpagestate.h
+ wx/propgrid/props.h
+
+
@@ -3415,29 +3541,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
- $(BASE_MACOSX_WXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
+
+ $(BASE_OSX_SHARED_SRC)
+ $(BASE_OSX_SHARED_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
$(BASE_UNIX_SRC)
$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
- $(BASE_MACOSX_SRC)
- $(BASE_MAC_SRC) $(BASE_MAC_CARBONLIB_SRC)
+ $(BASE_OSX_SHARED_SRC)
$(BASE_OS2_SRC)
$(BASE_PALMOS_SRC)
$(BASE_MSDOS_SRC)
- $(BASE_AND_GUI_MAC_SRC)
+ $(BASE_AND_GUI_OSX_CARBON_SRC)
+ $(BASE_AND_GUI_OSX_COCOA_SRC)
$(BASE_AND_GUI_WIN32_SRC)
@@ -3449,22 +3576,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
- $(BASE_MACOSX_WXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
+
+ $(BASE_OSX_SHARED_HDR)
+ $(BASE_OSX_SHARED_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
$(BASE_UNIX_HDR)
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
- $(BASE_MACOSX_HDR)
+ $(BASE_OSX_HDR)
$(BASE_PALMOS_HDR)
$(BASE_MSDOS_HDR)
$(BASE_OS2_HDR)
@@ -3484,7 +3612,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(NET_UNIX_SRC)
$(NET_WIN32_SRC) $(NET_WINCE_SRC)
$(NET_UNIX_SRC)
- $(NET_MAC_CARBONLIB_SRC)
$(NET_OS2_SRC)
@@ -3492,7 +3619,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(NET_WIN32_HDR) $(NET_WINCE_HDR)
$(NET_OS2_HDR)
$(NET_UNIX_HDR)
- $(NET_MAC_CARBONLIB_HDR)
@@ -3508,7 +3634,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MOTIF_LOWLEVEL_SRC)
$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)
$(MSW_LOWLEVEL_SRC)
- $(MAC_LOWLEVEL_SRC)
+ $(OSX_LOWLEVEL_SRC)
+ $(OSX_LOWLEVEL_SRC)
$(COCOA_LOWLEVEL_SRC)
$(OS2_LOWLEVEL_SRC)
$(X11_LOWLEVEL_SRC)
@@ -3521,7 +3648,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MOTIF_LOWLEVEL_HDR)
$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)
$(MSW_LOWLEVEL_HDR)
- $(MAC_LOWLEVEL_HDR)
+ $(OSX_LOWLEVEL_HDR)
+ $(OSX_LOWLEVEL_HDR)
$(COCOA_LOWLEVEL_HDR)
$(OS2_LOWLEVEL_HDR)
$(X11_LOWLEVEL_HDR)
@@ -3540,7 +3668,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MOTIF_SRC)
$(MSW_SRC) $(MSW_DESKTOP_SRC)
$(MSW_SRC) $(WINCE_SRC)
- $(MAC_SRC) $(MAC_OSX_SRC)
+ $(OSX_CARBON_SRC)
+ $(OSX_COCOA_SRC)
$(COCOA_SRC)
$(OS2_SRC)
@@ -3550,7 +3679,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MOTIF_HDR)
$(MSW_HDR) $(MSW_DESKTOP_HDR)
$(MSW_HDR) $(WINCE_HDR)
- $(MAC_CMN_HDR) $(MAC_HDR)
+ $(OSX_SHARED_HDR) $(OSX_CARBON_HDR)
+ $(OSX_SHARED_HDR) $(OSX_COCOA_HDR)
$(COCOA_HDR)
$(OS2_HDR)
@@ -3568,7 +3698,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)
$(ADVANCED_MSW_SRC)
- $(ADVANCED_MAC_SRC)
+ $(ADVANCED_OSX_CARBON_SRC)
+ $(ADVANCED_OSX_COCOA_SRC)
$(ADVANCED_COCOA_SRC)
$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)
$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)
@@ -3580,7 +3711,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)
$(ADVANCED_MSW_HDR)
- $(ADVANCED_MAC_HDR)
+ $(ADVANCED_OSX_CARBON_HDR)
+ $(ADVANCED_OSX_COCOA_HDR)
$(ADVANCED_COCOA_HDR)
$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)
$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)
@@ -3615,7 +3747,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)
$(MEDIA_MSW_SRC)
- $(MEDIA_MAC_SRC)
+ $(MEDIA_OSX_CARBON_SRC)
+ $(MEDIA_OSX_COCOA_SRC)
$(MEDIA_COCOA_SRC)
$(MEDIA_UNIX_SRC)
$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)
@@ -3625,7 +3758,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)
$(MEDIA_MSW_HDR)
- $(MEDIA_MAC_HDR)
+ $(MEDIA_OSX_CARBON_HDR)
$(MEDIA_COCOA_HDR)
$(MEDIA_UNIX_HDR)
$(MEDIA_UNIX_HDR)
@@ -3647,8 +3780,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(LOWLEVEL_HDR)
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
- $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
- $(STC_HDR)
+ $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
+ $(RICHTEXT_HDR) $(STC_HDR)
@@ -3668,7 +3801,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(BASE_CMN_HDR)
$(BASE_UNIX_HDR)
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
- $(BASE_MACOSX_HDR)
+ $(BASE_OSX_HDR)
$(BASE_PALMOS_HDR)
$(BASE_MSDOS_HDR)
$(NET_CMN_HDR)
@@ -3676,7 +3809,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(NET_WIN32_HDR) $(NET_WINCE_HDR)
$(NET_OS2_HDR)
$(NET_UNIX_HDR)
- $(NET_MAC_CARBONLIB_HDR)
$(XML_HDR)
@@ -3684,12 +3816,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(BASE_CMN_SRC)
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
- $(BASE_MAC_SRC)
+ $(BASE_OSX_SRC)
$(BASE_OS2_SRC)
$(BASE_MSDOS_SRC)
$(BASE_PALMOS_SRC)
$(BASE_AND_GUI_CMN_SRC)
- $(BASE_AND_GUI_MAC_SRC)
+ $(BASE_AND_GUI_OSX_CARBON_SRC)
+ $(BASE_AND_GUI_OSX_COCOA_SRC)
$(BASE_AND_GUI_WIN32_SRC)
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
$(XML_SRC)