Fix bug #11405 with MSVC build of emacsclientw.

 lib-src/makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
 instead of a literal -mwindows, which is not supported by MSVC.
 nt/nmake.defs (MWINDOWS): Define as "-subsystem:windows -entry:mainCRTStartup".
 Suggested by Fabrice Popineau <fabrice.popineau@supelec.fr>.
 nt/gmake.defs (MWINDOWS): Define as "-mwindows".

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3a1212c50319836d576be627ef9d682b8bf4c604..2c6c4ebcf72d29bb6283bf3d0b7b2f2379463e10 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-29  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-02  Juanma Barranquero  <lekktu@gmail.com>
 
        * emacsclient.c (min): Undef before redefining it.

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 117a835c03fa014e6b26fdb08070dfb7a19b5d5f..b4b59556034a18dc6965d7af0849784964c67d8c 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -70,7 +70,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

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 245f6b578f1c5eb4f5de2052f5516e3024db6128..5d86fe109479b8e9f80b2c24f97cecb0a0c923ab 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * nmake.defs (MWINDOWS): Define as
+       "-subsystem:windows -entry:mainCRTStartup".  Suggested by Fabrice
+       Popineau <fabrice.popineau@supelec.fr>.  (Bug#11405)
+
+       * gmake.defs (MWINDOWS): Define as "-mwindows".
+
 2012-05-28  Eli Zaretskii  <eliz@gnu.org>
 
        * configure.bat (genmakefiles): Move the redirection away from the

diff --git a/nt/gmake.defs b/nt/gmake.defs
index a669ffd27be0dcc9103bcfbea92dc0e72ffb6bbd..dd96b776363210b69eb5fcf4a2eb5bfb3d16ee45 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -210,6 +210,8 @@ else
 CHECKING_CFLAGS        =
 endif
 
+MWINDOWS        = -mwindows
+
 CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
 ESC_CFLAGS      = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 11079b4fb7d8f922344d00f90e17dddc372c81e1..b01e341f2d3de983ee0be86e72fb66c8ab6f0925 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -151,6 +151,8 @@ CHECKING_CFLAGS     = -DENABLE_CHECKING -DXASSERTS
 CHECKING_CFLAGS        =\r
 !endif\r
 \r
+MWINDOWS        = -subsystem:windows -entry:mainCRTStartup\r
+\r
 CFLAGS          = -I. $(ARCH_CFLAGS) \\r
                  $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
 ESC_CFLAGS      = -I. $(ARCH_CFLAGS) \\r