diff nt/xemacs.mak @ 5180:4cd28c29a7a1

merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 22:52:01 -0500
parents 97eb4942aec8
children 308d34e9f07d
line wrap: on
line diff
--- a/nt/xemacs.mak	Mon Mar 29 22:47:55 2010 -0500
+++ b/nt/xemacs.mak	Mon Mar 29 22:52:01 2010 -0500
@@ -515,7 +515,7 @@
 	$(OUTDIR)\frame-msw.obj \
 	$(OUTDIR)\glyphs-msw.obj \
 	$(OUTDIR)\gui-msw.obj \
-	$(OUTDIR)\objects-msw.obj \
+	$(OUTDIR)\fontcolor-msw.obj \
 	$(OUTDIR)\redisplay-msw.obj \
 	$(OUTDIR)\select-msw.obj \
 	$(OUTDIR)\dired-msw.obj
@@ -840,6 +840,7 @@
 	$(OUTDIR)\abbrev.obj \
 	$(OUTDIR)\alloc.obj \
 	$(OUTDIR)\alloca.obj \
+	$(OUTDIR)\array.obj \
 	$(OUTDIR)\blocktype.obj \
 	$(OUTDIR)\buffer.obj \
 	$(OUTDIR)\bytecode.obj \
@@ -857,7 +858,6 @@
 	$(OUTDIR)\doc.obj \
 	$(OUTDIR)\doprnt.obj \
 	$(OUTDIR)\dragdrop.obj \
-	$(OUTDIR)\dynarr.obj \
 	$(OUTDIR)\editfns.obj \
 	$(OUTDIR)\elhash.obj \
 	$(OUTDIR)\emacs.obj \
@@ -903,7 +903,7 @@
 #	#### Leave the next one out when integrating my working ws
 	$(OUTDIR)\nt.obj \
 	$(OUTDIR)\ntplay.obj \
-	$(OUTDIR)\objects.obj \
+	$(OUTDIR)\fontcolor.obj \
 	$(OUTDIR)\opaque.obj \
 	$(OUTDIR)\print.obj \
 	$(OUTDIR)\process.obj \