mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Update w32 dependencies in the wake of cygw32 changes.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2012-10-08 14:21:04 +02:00
parent b6f4e30044
commit c54ebba4e0
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib-src/ChangeLog
View file

@ -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.

2
lib-src/makefile.w32-in
View file

@ -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 \

5
src/ChangeLog
View file

@ -1,5 +1,10 @@
2012-10-08 Eli Zaretskii <eliz@gnu.org>
* 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.
* w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now
'const char *'.
(x_to_w32_color): Don't modify the argument, modify a copy instead.

8
src/makefile.w32-in
View file

@ -207,7 +207,7 @@ make-buildobj-SH:
GLOBAL_SOURCES = dosfns.c msdos.c \
xterm.c xfns.c xmenu.c xselect.c xrdb.c xsmfns.c fringe.c image.c \
fontset.c menu.c dbusbind.c \
w32.c w32console.c w32fns.c w32heap.c w32inevt.c \
w32.c w32console.c w32fns.c w32heap.c w32inevt.c cygw32.c \
w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c \
font.c w32font.c w32uniscribe.c \
dispnew.c frame.c scroll.c xdisp.c window.c bidi.c \
@ -424,6 +424,7 @@ DISPEXTERN_H = $(SRC)/dispextern.h \
FILEMODE_H = $(GNU_LIB)/filemode.h \
$(NT_INC)/sys/stat.h
FONT_H = $(SRC)/font.h \
$(FRAME_H) \
$(CCL_H)
FRAME_H = $(SRC)/frame.h \
$(DISPEXTERN_H)
@ -476,6 +477,8 @@ TERMHOOKS_H = $(SRC)/termhooks.h \
W32FONT_H = $(SRC)/w32font.h \
$(FONT_H)
W32TERM_H = $(SRC)/w32term.h \
$(ATIMER_H) \
$(FRAME_H) \
$(W32GUI_H)
WINDOW_H = $(SRC)/window.h \
$(DISPEXTERN_H)
@ -796,6 +799,8 @@ $(BLD)/emacs.$(O) : \
$(SRC)/unexec.h \
$(SRC)/w32.h \
$(SRC)/w32heap.h \
$(SRC)/w32select.h \
$(SRC)/w32font.h \
$(NT_INC)/sys/file.h \
$(NT_INC)/unistd.h \
$(GNU_LIB)/ignore-value.h \
@ -1233,6 +1238,7 @@ $(BLD)/w32console.$(O) : \
$(FRAME_H) \
$(LISP_H) \
$(TERMHOOKS_H) \
$(W32TERM_H) \
$(WINDOW_H)
$(BLD)/print.$(O) : \