X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/177c0ea74342272645959b82cf219faa0b3dba16..da1080a25c39c8f8fd1f73edcffed10d409a934f:/nt/nmake.defs

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 99db4211f1..7d19c74dcb 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,10 +1,10 @@
-#
-#  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, 2007 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
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #
 #  GNU Emacs is distributed in the hope that it will be useful,
@@ -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:
@@ -117,13 +117,16 @@ A		= lib
 BASE_LIBS	= $(libc) $(baselibs) oldnames.lib
 
 ADVAPI32	= advapi32.lib
+COMCTL32	= comctl32.lib
 COMDLG32	= comdlg32.lib
 GDI32		= gdi32.lib
 MPR		= mpr.lib
 SHELL32		= shell32.lib
 USER32		= user32.lib
 WSOCK32		= wsock32.lib
-WINMM     = winmm.lib
+WINMM		= winmm.lib
+WINSPOOL	= winspool.lib
+OLE32		= ole32.lib
 
 !ifdef NOOPT
 DEBUG_CFLAGS	= -DEMACSDEBUG
@@ -134,11 +137,11 @@ CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 $(ARCH_CFLAGS)
 		  -D_CRTAPI1=_cdecl $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS =
 
-SYS_LDFLAGS	= -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
+SYS_LDFLAGS	= -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
 
 # see comments in allocate_heap in w32heap.c before changing any of the
 # -stack, -heap, or -base settings.
-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)
+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)
 
 !ifdef NOOPT
 OBJDIR          = obj
@@ -147,8 +150,9 @@ OBJDIR          = obj-spd
 !endif
 $(OBJDIR):;	-mkdir $(OBJDIR)
 BLD             = $(OBJDIR)/$(ARCH)
-$(BLD):         $(OBJDIR)
+stamp_BLD:      $(OBJDIR)
 		-mkdir "$(BLD)"
+		echo $(BLD) > $@
 
 COMPILER_TEMP_FILES = *.pdb
 
@@ -161,6 +165,7 @@ FORVAR		= %%f
 FORDO		= ) do
 ENDFOR		=
 ARGQUOTE	= "
+# "
 DQUOTE		= \"
 DEL		= rm
 DEL_TREE	= rm -r
@@ -170,7 +175,7 @@ DEBUG_FLAG =
 DEBUG_LINK =
 !else
 DEBUG_FLAG = -Zi
-DEBUG_LINK = -debug:full -debugtype:both
+DEBUG_LINK = -debug:full
 !endif
 
 !if "$(ARCH)" == "i386"
@@ -230,3 +235,5 @@ EXTRA_LINK      = -profile
 .c{$(BLD)}.obj::
 		$(CC) $(CFLAGS) -Fo$(BLD)\ $<
 !ENDIF
+
+# arch-tag: fefa49b0-c23c-46c7-9094-cab2a405058e