Merge from cygw32 branch

[gnu-emacs] / nt / gmake.defs

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 0b29c73e741c37155be97db4abfcf3b3e3a9941a..358c262db28bac0775a478f08ea398608511b60b 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -139,15 +139,27 @@ OS_TYPE           = windowsnt
  ifeq "$(PROCESSOR_ARCHITECTURE)" "x86"
 ARCH           = i386
 CPU            = i386
+EMACS_HEAPSIZE = 27
+EMACS_PURESIZE = 5000000
+EMACS_MANIFEST = emacs-x86.manifest
  else
   ifeq "$(PROCESSOR_ARCHITECTURE)" "MIPS"
 ARCH           = mips
+EMACS_HEAPSIZE = 27
+EMACS_PURESIZE = 5000000
+EMACS_MANIFEST = emacs-mips.manifest
   else
    ifeq "$(PROCESSOR_ARCHITECTURE)" "ALPHA"
 ARCH           = alpha
+EMACS_HEAPSIZE = 27
+EMACS_PURESIZE = 5000000
+EMACS_MANIFEST = emacs-alpha.manifest
    else
     ifeq "$(PROCESSOR_ARCHITECTURE)" "PPC"
 ARCH           = ppc
+EMACS_HEAPSIZE = 27
+EMACS_PURESIZE = 5000000
+EMACS_MANIFEST = emacs-ppc.manifest
     else
      $(error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)")
     endif
@@ -199,7 +211,7 @@ OBJ1_c              = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
 OBJ2_c         = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2))
 
 ifdef NOOPT
-DEBUG_CFLAGS   = -DEMACSDEBUG -fno-crossjumping
+DEBUG_CFLAGS   = -DEMACSDEBUG -fno-crossjumping -std=gnu99
 else
 DEBUG_CFLAGS   =
 endif