aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/makefile.w32-in2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a4234693a82..85351d7f08d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12012-10-08 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (obj): Add cygw32.o.
4
12012-10-08 Daniel Colascione <dancol@dancol.org> 52012-10-08 Daniel Colascione <dancol@dancol.org>
2 6
3 * emacsclient.c: Include windows.h when HAVE_NTGUI. 7 * emacsclient.c: Include windows.h when HAVE_NTGUI.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 23ef71de10c..ecc5fb866b3 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -124,7 +124,7 @@ $(BLD)/profile.exe: $(PROFILEOBJS)
124obj = dosfns.o msdos.o \ 124obj = dosfns.o msdos.o \
125 xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ 125 xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
126 fontset.o menu.o \ 126 fontset.o menu.o \
127 w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ 127 w32.o w32console.o w32fns.o w32heap.o w32inevt.o cygw32.o \
128 w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ 128 w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
129 font.o w32font.o w32uniscribe.o \ 129 font.o w32font.o w32uniscribe.o \
130 dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \ 130 dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \