diff options
| author | Eli Zaretskii | 2012-05-29 19:15:12 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-05-29 19:15:12 +0300 |
| commit | 0652336413775df89b051f604278c4e9e5ce2784 (patch) | |
| tree | ffb4631964146190a57c5a28391797e345263e5c /nt | |
| parent | a02ae4e5bfa13097dabee45f45ee992cdb830bb3 (diff) | |
| download | emacs-0652336413775df89b051f604278c4e9e5ce2784.tar.gz emacs-0652336413775df89b051f604278c4e9e5ce2784.zip | |
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".
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 8 | ||||
| -rw-r--r-- | nt/gmake.defs | 2 | ||||
| -rw-r--r-- | nt/nmake.defs | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 245f6b578f1..5d86fe10947 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2012-05-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * nmake.defs (MWINDOWS): Define as | ||
| 4 | "-subsystem:windows -entry:mainCRTStartup". Suggested by Fabrice | ||
| 5 | Popineau <fabrice.popineau@supelec.fr>. (Bug#11405) | ||
| 6 | |||
| 7 | * gmake.defs (MWINDOWS): Define as "-mwindows". | ||
| 8 | |||
| 1 | 2012-05-28 Eli Zaretskii <eliz@gnu.org> | 9 | 2012-05-28 Eli Zaretskii <eliz@gnu.org> |
| 2 | 10 | ||
| 3 | * configure.bat (genmakefiles): Move the redirection away from the | 11 | * 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 | |||
| 210 | CHECKING_CFLAGS = | 210 | CHECKING_CFLAGS = |
| 211 | endif | 211 | endif |
| 212 | 212 | ||
| 213 | MWINDOWS = -mwindows | ||
| 214 | |||
| 213 | CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) | 215 | CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) |
| 214 | ESC_CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS) | 216 | ESC_CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS) |
| 215 | EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 | 217 | 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 | |||
| 151 | CHECKING_CFLAGS = | 151 | CHECKING_CFLAGS = |
| 152 | !endif | 152 | !endif |
| 153 | 153 | ||
| 154 | MWINDOWS = -subsystem:windows -entry:mainCRTStartup | ||
| 155 | |||
| 154 | CFLAGS = -I. $(ARCH_CFLAGS) \ | 156 | CFLAGS = -I. $(ARCH_CFLAGS) \ |
| 155 | $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) | 157 | $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) |
| 156 | ESC_CFLAGS = -I. $(ARCH_CFLAGS) \ | 158 | ESC_CFLAGS = -I. $(ARCH_CFLAGS) \ |