(xscheme-insert-expression): Use add-to-history.

[gnu-emacs] / nt / gmake.defs

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 0bf3f48dd6e5313b7d9035f05811848eee25090a..56799f783e15101800fb7e95f47bfb644e81ccad 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,6 +1,6 @@
-#
-#  Makefile definition file for building GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+#  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
+#    2005, 2006 Free Software Foundation, Inc.
 #
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
+#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
 
 # Ensure 'all' is the default target
 all:
@@ -177,6 +177,7 @@ SHELL32             = -lshell32
 USER32         = -luser32
 WSOCK32                = -lwsock32
 WINMM     = -lwinmm
+WINSPOOL       = -lwinspool
 
 ifdef NOOPT
 DEBUG_CFLAGS   = -DEMACSDEBUG
@@ -190,7 +191,7 @@ EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
 
 # see comments in allocate_heap in w32heap.c before changing any of the
 # -stack, -heap, or -image-base settings.
-TEMACS_EXTRA_LINK = -Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -g $(SUBSYSTEM_CONSOLE) -Wl,-entry,__start -Wl,-Map,$(BLD)/temacs.map
+TEMACS_EXTRA_LINK = -Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 $(SUBSYSTEM_CONSOLE) -Wl,-entry,__start -Wl,-Map,$(BLD)/temacs.map
 
 ifdef NOOPT
 OBJDIR          = oo
@@ -241,8 +242,8 @@ ifdef NODEBUG
 DEBUG_FLAG =
 DEBUG_LINK =
 else
-DEBUG_FLAG = -g
-DEBUG_LINK = -g
+DEBUG_FLAG = -gstabs+ -g3
+DEBUG_LINK = -gstabs+ -g3
 endif
 
 ifdef NOCYGWIN
@@ -253,7 +254,7 @@ ifeq "$(ARCH)" "i386"
 ifdef NOOPT
 ARCH_CFLAGS     = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN)
 else
-ARCH_CFLAGS     = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN) -mcpu=i686 -O2 \
+ARCH_CFLAGS     = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \
                  # -fbuiltin \
                  # -finline-functions \
                  # -fomit-frame-pointer