procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #11405 with MSVC build of emacsclientw.

Browse source 
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".
This commit is contained in:
Eli Zaretskii 2012-05-29 19:15:12 +03:00
parent a02ae4e5bf
commit 0652336413
5 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib-src/ChangeLog
View file

@ -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.

2
lib-src/makefile.w32-in
View file

@ -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

8
nt/ChangeLog
View file

@ -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

2
nt/gmake.defs
View file

@ -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

2
nt/nmake.defs
View file

@ -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) \