For some reason, this new feature is not in etags for Emacs 22,

[bpt/emacs.git] / nt / nmake.defs

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 94fa9f4..7d19c74 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,10 +1,10 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.\r
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,\r
-#    2005, 2006 Free Software Foundation, Inc.\r
+#    2005, 2006, 2007 Free Software Foundation, Inc.\r
 #\r
 #  GNU Emacs is free software; you can redistribute it and/or modify\r
 #  it under the terms of the GNU General Public License as published by\r
-#  the Free Software Foundation; either version 2, or (at your option)\r
+#  the Free Software Foundation; either version 3, or (at your option)\r
 #  any later version.\r
 #\r
 #  GNU Emacs is distributed in the hope that it will be useful,\r
@@ -117,14 +117,16 @@ A         = lib
 BASE_LIBS      = $(libc) $(baselibs) oldnames.lib\r
 \r
 ADVAPI32       = advapi32.lib\r
+COMCTL32       = comctl32.lib\r
 COMDLG32       = comdlg32.lib\r
 GDI32          = gdi32.lib\r
 MPR            = mpr.lib\r
 SHELL32                = shell32.lib\r
 USER32         = user32.lib\r
 WSOCK32                = wsock32.lib\r
-WINMM     = winmm.lib\r
+WINMM          = winmm.lib\r
 WINSPOOL       = winspool.lib\r
+OLE32          = ole32.lib\r
 \r
 !ifdef NOOPT\r
 DEBUG_CFLAGS   = -DEMACSDEBUG\r
@@ -139,7 +141,7 @@ SYS_LDFLAGS = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swapru
 \r
 # see comments in allocate_heap in w32heap.c before changing any of the\r
 # -stack, -heap, or -base settings.\r
-TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)\r
+TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)\r
 \r
 !ifdef NOOPT\r
 OBJDIR          = obj\r
@@ -148,8 +150,9 @@ OBJDIR          = obj-spd
 !endif\r
 $(OBJDIR):;    -mkdir $(OBJDIR)\r
 BLD             = $(OBJDIR)/$(ARCH)\r
-$(BLD):         $(OBJDIR)\r
+stamp_BLD:      $(OBJDIR)\r
                -mkdir "$(BLD)"\r
+               echo $(BLD) > $@\r
 \r
 COMPILER_TEMP_FILES = *.pdb\r
 \r
@@ -172,7 +175,7 @@ DEBUG_FLAG =
 DEBUG_LINK =\r
 !else\r
 DEBUG_FLAG = -Zi\r
-DEBUG_LINK = -debug:full -debugtype:both\r
+DEBUG_LINK = -debug:full\r
 !endif\r
 \r
 !if "$(ARCH)" == "i386"\r