diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-10-08 14:21:04 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-10-08 14:21:04 +0200 |
| commit | c54ebba4e076caeb6105c6bb682252b139a169fa (patch) | |
| tree | e92d2e0b580c7bc62d12ac0002f9b110d17c542a /lib-src | |
| parent | b6f4e30044100e223954a31eb7753d024d6413f6 (diff) | |
| download | emacs-c54ebba4e076caeb6105c6bb682252b139a169fa.tar.gz | |
Update w32 dependencies in the wake of cygw32 changes.
src/makefile.w32-in (FONT_H): Add $(FRAME_H).
(W32TERM_H): Add $(ATIMER_H) and $(FRAME_H).
($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies.
(GLOBAL_SOURCES): Add cygw32.c.
lib-src/makefile.w32-in (obj): Add cygw32.o.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
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 @@ +2012-10-08 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (obj): Add cygw32.o. + 2012-10-08 Daniel Colascione <dancol@dancol.org> * 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) obj = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ fontset.o menu.o \ - w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ + w32.o w32console.o w32fns.o w32heap.o w32inevt.o cygw32.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ font.o w32font.o w32uniscribe.o \ dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \ |