From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 17 Nov 2001 00:55:13 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-21.2~303
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7baf8036b60c8216679c1ce4adad4708ecfc9ecf;p=emacs.git

*** empty log message ***
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 87c494a05c8..965141b6abb 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-17  Jason Rumney  <jasonr@gnu.org>
+
+	* nmake.defs (SYS_LDFLAGS): Add setargv.obj for wildcard
+	expansion.  From Juanma Barranquero <lektu@terra.es>.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 178a43f8bc0..79e5b599b3a 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -133,7 +133,7 @@ CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN $(ARCH_CFLAGS) -D$(ARCH) \
 		  -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
+SYS_LDFLAGS	= -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.