upstream

2 files changed, 7 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d95137852e0..ff631d09fcd 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
+        instead of a literal -mwindows, which is not supported by MSVC.
+        (Bug#11405)
+
 2012-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * make-docfile.c: Improve comment style.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 83b818ed6c6..b727288351a 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -65,7 +65,7 @@ $(BLD)/emacsclient.exe:		$(ECLIENTOBJS)
 
 $(BLD)/emacsclientw.exe:        $(ECLIENTOBJS) $(CLIENTRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-                $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
+                $(LINK) $(LINK_OUT)$@ $(CLIENTRES) $(MWINDOWS) $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
 
 $(BLD)/emacsclient.$(O):        emacsclient.c
                 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c