[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108022: Fix bug #11405 with MSVC
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108022: Fix bug #11405 with MSVC build of emacsclientw. |
Date: |
Tue, 29 May 2012 19:15:12 +0300 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108022
fixes bug: http://debbugs.gnu.org/11405
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-05-29 19:15:12 +0300
message:
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 <address@hidden>.
nt/gmake.defs (MWINDOWS): Define as "-mwindows".
modified:
lib-src/ChangeLog
lib-src/makefile.w32-in
nt/ChangeLog
nt/gmake.defs
nt/nmake.defs
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-05-02 13:06:50 +0000
+++ b/lib-src/ChangeLog 2012-05-29 16:15:12 +0000
@@ -1,3 +1,9 @@
+2012-05-29 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* emacsclient.c (min): Undef before redefining it.
=== modified file 'lib-src/makefile.w32-in'
--- a/lib-src/makefile.w32-in 2012-02-09 07:48:22 +0000
+++ b/lib-src/makefile.w32-in 2012-05-29 16:15:12 +0000
@@ -70,7 +70,7 @@
$(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
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2012-05-28 16:17:35 +0000
+++ b/nt/ChangeLog 2012-05-29 16:15:12 +0000
@@ -1,3 +1,11 @@
+2012-05-29 Eli Zaretskii <address@hidden>
+
+ * nmake.defs (MWINDOWS): Define as
+ "-subsystem:windows -entry:mainCRTStartup". Suggested by Fabrice
+ Popineau <address@hidden>. (Bug#11405)
+
+ * gmake.defs (MWINDOWS): Define as "-mwindows".
+
2012-05-28 Eli Zaretskii <address@hidden>
* configure.bat (genmakefiles): Move the redirection away from the
=== modified file 'nt/gmake.defs'
--- a/nt/gmake.defs 2012-03-25 18:17:46 +0000
+++ b/nt/gmake.defs 2012-05-29 16:15:12 +0000
@@ -210,6 +210,8 @@
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
=== modified file 'nt/nmake.defs'
--- a/nt/nmake.defs 2012-03-25 18:17:46 +0000
+++ b/nt/nmake.defs 2012-05-29 16:15:12 +0000
@@ -151,6 +151,8 @@
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) \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108022: Fix bug #11405 with MSVC build of emacsclientw.,
Eli Zaretskii <=