diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
| commit | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch) | |
| tree | 78d2414d9791e1efc17ec9b35b438ae35602340a /admin | |
| parent | 1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff) | |
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/CPP-DEFINES | 5 | ||||
| -rw-r--r-- | admin/ChangeLog | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 82cb23d6ce8..9b8a54ace63 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -3,7 +3,6 @@ of their use. Feel free to add more macros and more categories. ** Distinguishing OSes ** -MAC_OS Compiling for the `mac' window-system. MAC_OS8 Compiling for Mac OS Classic (v8 or v9). No longer supported, all code using it can be removed. MAC_OSX Compiling for Mac OS X. Not bare Darwin. CYGWIN Compiling the Cygwin port. @@ -23,7 +22,11 @@ USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type inst ** Distinguishing GUIs ** HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars. +MAC_OS Compiling for the `mac' window-system. HAVE_CARBON Compile support for the Carbon GUI. Requires MAC_OS? +HAVE_NS Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep. +NS_IMPL_GNUSTEP Compile support for GNUSTEP implementation of NS GUI API. +NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. HAVE_X11 Compile support for the X11 GUI. HAVE_X_WINDOWS Compile support for X Window system X11 ?? Makefile.in suggests it's equivalent to HAVE_X11 diff --git a/admin/ChangeLog b/admin/ChangeLog index 090f8c20890..f56344da46c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com> + + * CPP_DEFINES: Add NS port related defines. + 2008-06-16 Glenn Morris <rgm@gnu.org> * admin.el (set-version): Add doc/lispref/vol1.texi,vol2.texi, |