Merge from emacs--rel--22

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

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 5f52bc1..7d19c74 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -4,7 +4,7 @@
 #\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