diff options
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
2 files changed, 7 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 @@ | |||
| 1 | 2012-05-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS) | ||
| 4 | instead of a literal -mwindows, which is not supported by MSVC. | ||
| 5 | (Bug#11405) | ||
| 6 | |||
| 1 | 2012-05-02 Juanma Barranquero <lekktu@gmail.com> | 7 | 2012-05-02 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * emacsclient.c (min): Undef before redefining it. | 9 | * 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) | |||
| 70 | 70 | ||
| 71 | $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES) | 71 | $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES) |
| 72 | # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib | 72 | # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib |
| 73 | $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) | 73 | $(LINK) $(LINK_OUT)$@ $(CLIENTRES) $(MWINDOWS) $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) |
| 74 | 74 | ||
| 75 | $(BLD)/emacsclient.$(O): emacsclient.c | 75 | $(BLD)/emacsclient.$(O): emacsclient.c |
| 76 | $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c | 76 | $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c |