* mh-customize.el (mh-toolbar): Rename to mh-tool-bar.

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

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 178a43f..76a3462 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,21 +1,21 @@
+#  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.\r
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,\r
+#    2005 Free Software Foundation, Inc.\r
 #\r
-#  Makefile definition file for building GNU Emacs on the Microsoft W32 API.\r
-#  Copyright (c) 2000-2001 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
 #  any later version.\r
-#  \r
+#\r
 #  GNU Emacs is distributed in the hope that it will be useful,\r
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
 #  GNU General Public License for more details.\r
-#  \r
+#\r
 #  You should have received a copy of the GNU General Public License\r
 #  along with GNU Emacs; see the file COPYING.  If not, write to\r
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
-#  Boston, MA 02111-1307, USA.\r
+#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
+#  Boston, MA 02110-1301, USA.\r
 \r
 # Ensure 'all' is the default target\r
 all:\r
@@ -64,7 +64,7 @@ _NMAKE_VER=$(_NMAKE_VER_4)
 !endif\r
 \r
 # Determine the architecture we're running on.\r
-# Define ARCH for our purposes; \r
+# Define ARCH for our purposes;\r
 # Define CPU for use by ntwin32.mak;\r
 # Define CONFIG_H to the appropriate config.h for the system;\r
 #\r
@@ -110,7 +110,7 @@ RC_OUT              = -Fo
 RC_INCLUDE     = -i\r
 \r
 libc           = libc.lib\r
-baselibs       = \r
+baselibs       =\r
 O              = obj\r
 A              = lib\r
 \r
@@ -123,17 +123,19 @@ MPR               = mpr.lib
 SHELL32                = shell32.lib\r
 USER32         = user32.lib\r
 WSOCK32                = wsock32.lib\r
+WINMM     = winmm.lib\r
+WINSPOOL       = winspool.lib\r
 \r
 !ifdef NOOPT\r
 DEBUG_CFLAGS   = -DEMACSDEBUG\r
 !else\r
-DEBUG_CFLAGS   = \r
+DEBUG_CFLAGS   =\r
 !endif\r
-CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN $(ARCH_CFLAGS) -D$(ARCH) \\r
+CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 $(ARCH_CFLAGS) -D$(ARCH) \\r
                  -D_CRTAPI1=_cdecl $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
 EMACS_EXTRA_C_FLAGS =\r
 \r
-SYS_LDFLAGS    = -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net\r
+SYS_LDFLAGS    = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
 \r
 # see comments in allocate_heap in w32heap.c before changing any of the\r
 # -stack, -heap, or -base settings.\r
@@ -160,13 +162,14 @@ FORVAR            = %%f
 FORDO          = ) do\r
 ENDFOR         =\r
 ARGQUOTE       = "\r
+# "\r
 DQUOTE         = \"\r
 DEL            = rm\r
 DEL_TREE       = rm -r\r
 \r
 !ifdef NODEBUG\r
-DEBUG_FLAG = \r
-DEBUG_LINK = \r
+DEBUG_FLAG =\r
+DEBUG_LINK =\r
 !else\r
 DEBUG_FLAG = -Zi\r
 DEBUG_LINK = -debug:full -debugtype:both\r
@@ -229,3 +232,5 @@ EXTRA_LINK      = -profile
 .c{$(BLD)}.obj::\r
                $(CC) $(CFLAGS) -Fo$(BLD)\ $<\r
 !ENDIF\r
+\r
+# arch-tag: fefa49b0-c23c-46c7-9094-cab2a405058e\r