diff options
| author | Chong Yidong | 2012-05-31 14:08:06 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-05-31 14:08:06 +0800 |
| commit | efc00ab16e2890b75d7224434ac43fe944ade4dd (patch) | |
| tree | 28c1078ca32b96402cd1a5f618a17b3526143f27 /lib-src | |
| parent | ba93a18774352c97d6dd73c73141cbff6305581b (diff) | |
| parent | dd41169b6cb0105b0766f3d368c657ebafc19cba (diff) | |
| download | emacs-efc00ab16e2890b75d7224434ac43fe944ade4dd.tar.gz emacs-efc00ab16e2890b75d7224434ac43fe944ade4dd.zip | |
Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de
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 d95137852e0..ff631d09fcd 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-05-31 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-30 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2012-05-30 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * make-docfile.c: Improve comment style. | 9 | * make-docfile.c: Improve comment style. |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 83b818ed6c6..b727288351a 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -65,7 +65,7 @@ $(BLD)/emacsclient.exe: $(ECLIENTOBJS) | |||
| 65 | 65 | ||
| 66 | $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES) | 66 | $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES) |
| 67 | # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib | 67 | # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib |
| 68 | $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) | 68 | $(LINK) $(LINK_OUT)$@ $(CLIENTRES) $(MWINDOWS) $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) |
| 69 | 69 | ||
| 70 | $(BLD)/emacsclient.$(O): emacsclient.c | 70 | $(BLD)/emacsclient.$(O): emacsclient.c |
| 71 | $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c | 71 | $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c |