* makefile.MPW: Add dependencies for fringe.c.x, image.c.x, and
lastfile.c.x. (PPCCOptions): Add -alloca. (EmacsObjects): Remove alloca.c.x. Add fringe.c.x, image.c.x, and lastfile.c.x. (Emacs MPW): Add QuickTimeLib. (EmacsSource): Remove alloca.c. Add fringe.c, image.c, and lastfile.c. (LispSource): Fix pathnames for byte-run.elc, float-sup.elc, and map-ynp.elc. * inc/config.h (USE_LSB_TAG) [__MRC__]: Define. (UNEXEC_SRC): Close comment. * inc/epaths.h (PATH_BITMAPS, PATH_GAME): New defines. * inc/m-mac.h (HAVE_ALLOCA) [__MRC__]: Define. (C_ALLOCA) [__MRC__]: Don't define. * inc/s-mac.h (X_OK): New define. (DECL_ALIGN) [USE_LSB_TAG && __MRC__]: New macro. (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS.
This commit is contained in:
Steven Tamm
parent
74e2abe26a
commit
22933cbff4
6 changed files with 89 additions and 10 deletions
|
|
@ -1,3 +1,24 @@
|
|||
2004-12-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
* makefile.MPW: Add dependencies for fringe.c.x, image.c.x, and
|
||||
lastfile.c.x.
|
||||
(PPCCOptions): Add -alloca.
|
||||
(EmacsObjects): Remove alloca.c.x. Add fringe.c.x, image.c.x, and
|
||||
lastfile.c.x.
|
||||
(Emacs MPW): Add QuickTimeLib.
|
||||
(EmacsSource): Remove alloca.c. Add fringe.c, image.c, and
|
||||
lastfile.c.
|
||||
(LispSource): Fix pathnames for byte-run.elc, float-sup.elc, and
|
||||
map-ynp.elc.
|
||||
* inc/config.h (USE_LSB_TAG) [__MRC__]: Define.
|
||||
(UNEXEC_SRC): Close comment.
|
||||
* inc/epaths.h (PATH_BITMAPS, PATH_GAME): New defines.
|
||||
* inc/m-mac.h (HAVE_ALLOCA) [__MRC__]: Define.
|
||||
(C_ALLOCA) [__MRC__]: Don't define.
|
||||
* inc/s-mac.h (X_OK): New define.
|
||||
(DECL_ALIGN) [USE_LSB_TAG && __MRC__]: New macro.
|
||||
(GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS.
|
||||
|
||||
2004-05-29 Steven Tamm <steventamm@mac.com>
|
||||
|
||||
* INSTALL: Fixing typos
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ Boston, MA 02111-1307, USA. */
|
|||
|
||||
/* #undef CRAY_STACKSEG_END */
|
||||
|
||||
/* #undef UNEXEC_SRC unexelf.c
|
||||
/* #undef UNEXEC_SRC */
|
||||
|
||||
/* #undef HAVE_LIBXBSD */
|
||||
/* #undef HAVE_XRMSETDATABASE */
|
||||
|
|
@ -366,6 +366,13 @@ Boston, MA 02111-1307, USA. */
|
|||
/* Define to make ftello visible on some hosts (e.g. glibc 2.1.3). */
|
||||
/* #undef _XOPEN_SOURCE */
|
||||
|
||||
#ifdef __MRC__
|
||||
/* Use low-bits for tags. If ENABLE_CHECKING is turned on together
|
||||
with USE_LSB_TAG, optimization flags should be explicitly turned
|
||||
off. */
|
||||
#define USE_LSB_TAG
|
||||
#endif
|
||||
|
||||
#ifdef __MRC__
|
||||
#define EMACS_CONFIGURATION "macos-mpw"
|
||||
#else /* Assume CodeWarrior */
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Boston, MA 02111-1307, USA. */
|
|||
|
||||
/* Where Emacs should look for X bitmap files.
|
||||
The lisp variable x-bitmap-file-path is set based on this value. */
|
||||
/* #define PATH_BITMAPS "/usr/include/X11/bitmaps" */
|
||||
#define PATH_BITMAPS ""
|
||||
|
||||
/* Where Emacs should look for its docstring file. The lisp variable
|
||||
doc-directory is set to this value. */
|
||||
|
|
@ -57,6 +57,9 @@ Boston, MA 02111-1307, USA. */
|
|||
macro, and is then used to set the Info-default-directory-list. */
|
||||
#define PATH_INFO "~emacs/info"
|
||||
|
||||
/* Where Emacs should store game score files. */
|
||||
#define PATH_GAME "~emacs/games"
|
||||
|
||||
/* Where Emacs should look for the application default file. */
|
||||
/* #define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S" */
|
||||
|
||||
|
|
|
|||
|
|
@ -87,8 +87,11 @@ Boston, MA 02111-1307, USA. */
|
|||
Define neither one if an assembler-language alloca
|
||||
in the file alloca.s should be used. */
|
||||
|
||||
#ifdef __MRC__
|
||||
#define HAVE_ALLOCA
|
||||
#else
|
||||
#define C_ALLOCA
|
||||
/* #define HAVE_ALLOCA */
|
||||
#endif
|
||||
|
||||
/* Define NO_REMAP if memory segmentation makes it not work well
|
||||
to change the boundary between the text section and data section
|
||||
|
|
|
|||
|
|
@ -255,6 +255,10 @@ void read_input_waiting ();
|
|||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifndef X_OK
|
||||
#define X_OK 01
|
||||
#endif
|
||||
|
||||
#undef unlink
|
||||
#define unlink sys_unlink
|
||||
#undef read
|
||||
|
|
@ -319,5 +323,15 @@ extern double atof (const char *);
|
|||
|
||||
#define SYMS_SYSTEM syms_of_mac()
|
||||
|
||||
#ifdef USE_LSB_TAG
|
||||
#ifdef __MRC__
|
||||
#define DECL_ALIGN(type, var) type var
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
|
||||
stack. */
|
||||
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
|
||||
|
||||
/* arch-tag: 6a941c4b-a419-4d25-80ac-9335053e58b2
|
||||
(do not change this comment) */
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ OptOption = # -opt speed # alternatively set to -opt off or -opt size
|
|||
|
||||
# The -noMapCR options and the two -d's must not be removed.
|
||||
|
||||
PPCCOptions = {SymOption} {OptOption} -noMapCR -enum int ¶
|
||||
PPCCOptions = {SymOption} {OptOption} -noMapCR -enum int -alloca ¶
|
||||
-typecheck relaxed -w off ¶
|
||||
-includes unix -i {Includes},{Src} ¶
|
||||
-d emacs=1 -d HAVE_CONFIG_H -d MAC_OS -d MAC_OS8
|
||||
|
|
@ -63,7 +63,6 @@ BLOCKINPUT_H_GROUP = "{Src}blockinput.h" "{Src}atimer.h" "{Src}systime.h"
|
|||
EmacsObjects = ¶
|
||||
"{Src}abbrev.c.x" ¶
|
||||
"{Src}alloc.c.x" ¶
|
||||
"{Src}alloca.c.x" ¶
|
||||
"{Src}atimer.c.x" ¶
|
||||
"{Src}buffer.c.x" ¶
|
||||
"{Src}bytecode.c.x" ¶
|
||||
|
|
@ -92,7 +91,9 @@ EmacsObjects =
|
|||
"{Src}fns.c.x" ¶
|
||||
"{Src}fontset.c.x" ¶
|
||||
"{Src}frame.c.x" ¶
|
||||
"{Src}fringe.c.x" ¶
|
||||
"{Src}getloadavg.c.x" ¶
|
||||
"{Src}image.c.x" ¶
|
||||
"{Src}indent.c.x" ¶
|
||||
"{Src}insdel.c.x" ¶
|
||||
"{Src}intervals.c.x" ¶
|
||||
|
|
@ -120,7 +121,8 @@ EmacsObjects =
|
|||
"{Src}undo.c.x" ¶
|
||||
"{Src}window.c.x" ¶
|
||||
"{Src}xdisp.c.x" ¶
|
||||
"{Src}xfaces.c.x"
|
||||
"{Src}xfaces.c.x" ¶
|
||||
"{Src}lastfile.c.x"
|
||||
|
||||
# The list of object files generated from new source files of the Macintosh port.
|
||||
|
||||
|
|
@ -142,6 +144,7 @@ Emacs
|
|||
"{SharedLibraries}AppleScriptLib" ¶
|
||||
"{SharedLibraries}TextEncodingConverter" ¶
|
||||
"{SharedLibraries}AppearanceLib" ¶
|
||||
"{SharedLibraries}QuickTimeLib" ¶
|
||||
"{PPCLibraries}StdCRuntime.o" ¶
|
||||
"{PPCLibraries}PPCCRuntime.o" ¶
|
||||
"{PPCLibraries}PPCToolLibs.o" ¶
|
||||
|
|
@ -495,10 +498,33 @@ Emacs
|
|||
"{Src}commands.h" ¶
|
||||
"{Src}keyboard.h"
|
||||
|
||||
{Src}fringe.c.x Ä ¶
|
||||
{CONFIG_H_GROUP} ¶
|
||||
"{Src}lisp.h" ¶
|
||||
"{Src}frame.h" ¶
|
||||
{WINDOW_H_GROUP} ¶
|
||||
"{Src}buffer.h" ¶
|
||||
{BLOCKINPUT_H_GROUP}
|
||||
|
||||
{Src}getloadavg.c.x Ä ¶
|
||||
{CONFIG_H_GROUP} ¶
|
||||
"{Includes}sys:types.h"
|
||||
|
||||
{Src}image.c.x Ä ¶
|
||||
{CONFIG_H_GROUP} ¶
|
||||
"{Src}lisp.h" ¶
|
||||
"{Src}frame.h" ¶
|
||||
{WINDOW_H_GROUP} ¶
|
||||
{DISPEXTERN_H_GROUP} ¶
|
||||
{BLOCKINPUT_H_GROUP} ¶
|
||||
"{Includes}epaths.h" ¶
|
||||
"{Src}macterm.h" ¶
|
||||
"{Src}macgui.h" ¶
|
||||
"{Src}frame.h" ¶
|
||||
"{Includes}sys:stat.h" ¶
|
||||
"{Includes}alloca.h" ¶
|
||||
"{Includes}sys:param.h"
|
||||
|
||||
{Src}indent.c.x Ä ¶
|
||||
{CONFIG_H_GROUP} ¶
|
||||
"{Src}lisp.h" ¶
|
||||
|
|
@ -574,6 +600,9 @@ Emacs
|
|||
"{Src}puresize.h" ¶
|
||||
{INTERVALS_H_GROUP}
|
||||
|
||||
{Src}lastfile.c.x Ä ¶
|
||||
{CONFIG_H_GROUP}
|
||||
|
||||
{Src}lread.c.x Ä ¶
|
||||
{CONFIG_H_GROUP} ¶
|
||||
"{Includes}sys:types.h" ¶
|
||||
|
|
@ -935,7 +964,6 @@ DistClean
|
|||
EmacsSource = ¶
|
||||
"{Src}abbrev.c" ¶
|
||||
"{Src}alloc.c" ¶
|
||||
"{Src}alloca.c" ¶
|
||||
"{Src}atimer.c" ¶
|
||||
"{Src}buffer.c" ¶
|
||||
"{Src}bytecode.c" ¶
|
||||
|
|
@ -964,12 +992,15 @@ EmacsSource =
|
|||
"{Src}fns.c" ¶
|
||||
"{Src}fontset.c" ¶
|
||||
"{Src}frame.c" ¶
|
||||
"{Src}fringe.c" ¶
|
||||
"{Src}getloadavg.c" ¶
|
||||
"{Src}image.c" ¶
|
||||
"{Src}indent.c" ¶
|
||||
"{Src}insdel.c" ¶
|
||||
"{Src}intervals.c" ¶
|
||||
"{Src}keyboard.c" ¶
|
||||
"{Src}keymap.c" ¶
|
||||
"{Src}lastfile.c" ¶
|
||||
"{Src}lread.c" ¶
|
||||
"{Src}macros.c" ¶
|
||||
"{Src}marker.c" ¶
|
||||
|
|
@ -1017,7 +1048,7 @@ LispSource =
|
|||
{Lisp}international:codepage.elc ¶
|
||||
{Lisp}abbrev.elc ¶
|
||||
{Lisp}buff-menu.elc ¶
|
||||
{Lisp}byte-run.elc ¶
|
||||
{Lisp}emacs-lisp:byte-run.elc ¶
|
||||
{Lisp}cus-start.el ¶
|
||||
{Lisp}custom.elc ¶
|
||||
{Lisp}emacs-lisp:lisp-mode.elc ¶
|
||||
|
|
@ -1025,7 +1056,7 @@ LispSource =
|
|||
{Lisp}facemenu.elc ¶
|
||||
{Lisp}faces.elc ¶
|
||||
{Lisp}files.elc ¶
|
||||
{Lisp}float-sup.elc ¶
|
||||
{Lisp}emacs-lisp:float-sup.elc ¶
|
||||
{Lisp}format.elc ¶
|
||||
{Lisp}frame.elc ¶
|
||||
{Lisp}help.elc ¶
|
||||
|
|
@ -1034,7 +1065,7 @@ LispSource =
|
|||
{Lisp}loadup.el ¶
|
||||
{Lisp}loaddefs.el ¶
|
||||
{Lisp}bindings.elc ¶
|
||||
{Lisp}map-ynp.elc ¶
|
||||
{Lisp}emacs-lisp:map-ynp.elc ¶
|
||||
{Lisp}international:mule.elc ¶
|
||||
{Lisp}international:mule-conf.el ¶
|
||||
{Lisp}international:mule-cmds.elc ¶
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue