diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-05-29 19:15:12 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-05-29 19:15:12 +0300 |
| commit | 0652336413775df89b051f604278c4e9e5ce2784 (patch) | |
| tree | ffb4631964146190a57c5a28391797e345263e5c | |
| parent | a02ae4e5bfa13097dabee45f45ee992cdb830bb3 (diff) | |
| download | emacs-0652336413775df89b051f604278c4e9e5ce2784.tar.gz | |
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".
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 | ||||
| -rw-r--r-- | nt/ChangeLog | 8 | ||||
| -rw-r--r-- | nt/gmake.defs | 2 | ||||
| -rw-r--r-- | nt/nmake.defs | 2 |
5 files changed, 19 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 3a1212c5031..2c6c4ebcf72 100644 --- 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 117a835c03f..b4b59556034 100644 --- 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 245f6b578f1..5d86fe10947 100644 --- 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 a669ffd27be..dd96b776363 100644 --- 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 11079b4fb7d..b01e341f2d3 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -151,6 +151,8 @@ CHECKING_CFLAGS = -DENABLE_CHECKING -DXASSERTS CHECKING_CFLAGS =
!endif
+MWINDOWS = -subsystem:windows -entry:mainCRTStartup
+
CFLAGS = -I. $(ARCH_CFLAGS) \
$(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
ESC_CFLAGS = -I. $(ARCH_CFLAGS) \
|