aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2008-02-03 21:33:49 +0000
committerJason Rumney2008-02-03 21:33:49 +0000
commitffe421835cf906463e3f399397a60e70d9891352 (patch)
treecf39957f7f75b7e28e44e9bfc73572eabfd42aea /src
parentc7aa34a53a62b4972f4b761e86194edd2ae5eb59 (diff)
downloademacs-ffe421835cf906463e3f399397a60e70d9891352.tar.gz
emacs-ffe421835cf906463e3f399397a60e70d9891352.zip
(OBJ1): Include font.o here.
(FONTOBJ) [USE_FONTBACKEND]: Instead of here.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/makefile.w32-in92
2 files changed, 51 insertions, 46 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7f663cd20c8..30e62212cab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-02-03 Jason Rumney <jasonr@gnu.org>
2
3 * makefile.w32-in (OBJ1): Include font.o here.
4 (FONTOBJ) [USE_FONTBACKEND]: Instead of here.
5
12008-02-02 Jason Rumney <jasonr@gnu.org> 62008-02-02 Jason Rumney <jasonr@gnu.org>
2 7
3 * makefile.w32-in (temacs): Bump EMHEAP to 21. 8 * makefile.w32-in (temacs): Bump EMHEAP to 21.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 7b3ba3cfd69..1c12afa0168 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -56,42 +56,42 @@ FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
56# 56#
57OBJ0 = $(BLD)/emacs.$(O) 57OBJ0 = $(BLD)/emacs.$(O)
58 58
59OBJ1 = $(BLD)/alloc.$(O) \ 59OBJ1 = $(BLD)/alloc.$(O) \
60 $(BLD)/atimer.$(O) \ 60 $(BLD)/atimer.$(O) \
61 $(BLD)/buffer.$(O) \ 61 $(BLD)/buffer.$(O) \
62 $(BLD)/bytecode.$(O) \ 62 $(BLD)/bytecode.$(O) \
63 $(BLD)/callint.$(O) \ 63 $(BLD)/callint.$(O) \
64 $(BLD)/callproc.$(O) \ 64 $(BLD)/callproc.$(O) \
65 $(BLD)/casefiddle.$(O) \ 65 $(BLD)/casefiddle.$(O) \
66 $(BLD)/cm.$(O) \ 66 $(BLD)/cm.$(O) \
67 $(BLD)/cmds.$(O) \ 67 $(BLD)/cmds.$(O) \
68 $(BLD)/data.$(O) \ 68 $(BLD)/data.$(O) \
69 $(BLD)/dired.$(O) \ 69 $(BLD)/dired.$(O) \
70 $(BLD)/dispnew.$(O) \ 70 $(BLD)/dispnew.$(O) \
71 $(BLD)/doc.$(O) \ 71 $(BLD)/doc.$(O) \
72 $(BLD)/doprnt.$(O) \ 72 $(BLD)/doprnt.$(O) \
73 $(BLD)/editfns.$(O) \ 73 $(BLD)/editfns.$(O) \
74 $(BLD)/eval.$(O) \ 74 $(BLD)/eval.$(O) \
75 $(BLD)/fileio.$(O) \ 75 $(BLD)/fileio.$(O) \
76 $(BLD)/filelock.$(O) \ 76 $(BLD)/filelock.$(O) \
77 $(BLD)/filemode.$(O) \ 77 $(BLD)/filemode.$(O) \
78 $(BLD)/fns.$(O) \ 78 $(BLD)/fns.$(O) \
79 $(BLD)/indent.$(O) \ 79 $(BLD)/indent.$(O) \
80 $(BLD)/insdel.$(O) \ 80 $(BLD)/insdel.$(O) \
81 $(BLD)/keyboard.$(O) \ 81 $(BLD)/keyboard.$(O) \
82 $(BLD)/keymap.$(O) \ 82 $(BLD)/keymap.$(O) \
83 $(BLD)/lread.$(O) \ 83 $(BLD)/lread.$(O) \
84 $(BLD)/macros.$(O) \ 84 $(BLD)/macros.$(O) \
85 $(BLD)/marker.$(O) \ 85 $(BLD)/marker.$(O) \
86 $(BLD)/md5.$(O) \ 86 $(BLD)/md5.$(O) \
87 $(BLD)/minibuf.$(O) \ 87 $(BLD)/minibuf.$(O) \
88 $(BLD)/w32.$(O) \ 88 $(BLD)/w32.$(O) \
89 $(BLD)/w32heap.$(O) \ 89 $(BLD)/w32heap.$(O) \
90 $(BLD)/w32inevt.$(O) \ 90 $(BLD)/w32inevt.$(O) \
91 $(BLD)/w32proc.$(O) \ 91 $(BLD)/w32proc.$(O) \
92 $(BLD)/w32console.$(O) \ 92 $(BLD)/w32console.$(O) \
93 $(BLD)/print.$(O) \ 93 $(BLD)/print.$(O) \
94 $(BLD)/process.$(O) \ 94 $(BLD)/process.$(O) \
95 $(BLD)/regex.$(O) \ 95 $(BLD)/regex.$(O) \
96 $(BLD)/scroll.$(O) \ 96 $(BLD)/scroll.$(O) \
97 $(BLD)/search.$(O) \ 97 $(BLD)/search.$(O) \
@@ -99,48 +99,48 @@ OBJ1 = $(BLD)/alloc.$(O) \
99 $(BLD)/syntax.$(O) \ 99 $(BLD)/syntax.$(O) \
100 $(BLD)/sysdep.$(O) \ 100 $(BLD)/sysdep.$(O) \
101 $(BLD)/term.$(O) \ 101 $(BLD)/term.$(O) \
102 $(BLD)/termcap.$(O) \ 102 $(BLD)/termcap.$(O) \
103 $(BLD)/tparam.$(O) \ 103 $(BLD)/tparam.$(O) \
104 $(BLD)/undo.$(O) \ 104 $(BLD)/undo.$(O) \
105 $(BLD)/unexw32.$(O) \ 105 $(BLD)/unexw32.$(O) \
106 $(BLD)/window.$(O) \ 106 $(BLD)/window.$(O) \
107 $(BLD)/xdisp.$(O) \ 107 $(BLD)/xdisp.$(O) \
108 $(BLD)/casetab.$(O) \ 108 $(BLD)/casetab.$(O) \
109 $(BLD)/floatfns.$(O) \ 109 $(BLD)/floatfns.$(O) \
110 $(BLD)/frame.$(O) \ 110 $(BLD)/frame.$(O) \
111 $(BLD)/gmalloc.$(O) \ 111 $(BLD)/gmalloc.$(O) \
112 $(BLD)/intervals.$(O) \ 112 $(BLD)/intervals.$(O) \
113 $(BLD)/composite.$(O) \ 113 $(BLD)/composite.$(O) \
114 $(BLD)/ralloc.$(O) \ 114 $(BLD)/ralloc.$(O) \
115 $(BLD)/textprop.$(O) \ 115 $(BLD)/textprop.$(O) \
116 $(BLD)/vm-limit.$(O) \ 116 $(BLD)/vm-limit.$(O) \
117 $(BLD)/region-cache.$(O) \ 117 $(BLD)/region-cache.$(O) \
118 $(BLD)/strftime.$(O) \ 118 $(BLD)/strftime.$(O) \
119 $(BLD)/charset.$(O) \ 119 $(BLD)/charset.$(O) \
120 $(BLD)/character.$(O) \ 120 $(BLD)/character.$(O) \
121 $(BLD)/chartab.$(O) \ 121 $(BLD)/chartab.$(O) \
122 $(BLD)/coding.$(O) \ 122 $(BLD)/coding.$(O) \
123 $(BLD)/category.$(O) \ 123 $(BLD)/category.$(O) \
124 $(BLD)/ccl.$(O) \ 124 $(BLD)/ccl.$(O) \
125 $(BLD)/fontset.$(O) \ 125 $(BLD)/font.$(O) \
126 $(BLD)/fontset.$(O) \
126 $(BLD)/fringe.$(O) \ 127 $(BLD)/fringe.$(O) \
127 $(BLD)/image.$(O) \ 128 $(BLD)/image.$(O) \
128 $(BLD)/terminal.$(O) 129 $(BLD)/terminal.$(O)
129 130
130 131
131WIN32OBJ = $(BLD)/w32term.$(O) \ 132WIN32OBJ = $(BLD)/w32term.$(O) \
132 $(BLD)/w32xfns.$(O) \ 133 $(BLD)/w32xfns.$(O) \
133 $(BLD)/w32fns.$(O) \ 134 $(BLD)/w32fns.$(O) \
134 $(BLD)/xfaces.$(O) \ 135 $(BLD)/xfaces.$(O) \
135 $(BLD)/w32select.$(O) \ 136 $(BLD)/w32select.$(O) \
136 $(BLD)/w32menu.$(O) \ 137 $(BLD)/w32menu.$(O) \
137 $(BLD)/w32reg.$(O) \ 138 $(BLD)/w32reg.$(O) \
138 $(BLD)/w32bdf.$(O) 139 $(BLD)/w32bdf.$(O)
139 140
140FONTOBJ = 141FONTOBJ =
141ifdef USE_FONTBACKEND 142ifdef USE_FONTBACKEND
142FONTOBJ = $(BLD)/font.$(O) \ 143FONTOBJ = $(BLD)/w32font.$(O)
143 $(BLD)/w32font.$(O)
144endif 144endif
145 145
146LIBS = $(TLIB0) \ 146LIBS = $(TLIB0) \
@@ -152,7 +152,7 @@ LIBS = $(TLIB0) \
152 $(GDI32) \ 152 $(GDI32) \
153 $(COMDLG32) \ 153 $(COMDLG32) \
154 $(USER32) \ 154 $(USER32) \
155 $(MPR) \ 155 $(MPR) \
156 $(SHELL32) \ 156 $(SHELL32) \
157 $(WINSPOOL) \ 157 $(WINSPOOL) \
158 $(OLE32) \ 158 $(OLE32) \
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-29 05:09:53 +0000