revise a couple of recent changes
include/.gitignore should continue to ignore old files in case someone checks out an older version, builds, then checks out the current version without running 'make spotless' first. sys/unix/Makefile.utl: tiletxt.o depends on tilemap.c in addition to tiletxt.c.
This commit is contained in:
+14
-2
@@ -1,5 +1,17 @@
|
|||||||
.cvsignore
|
# generated at build time so not managed by git
|
||||||
|
nhlua.h
|
||||||
|
# obsolete but still built by 'makedefs' in conjunction with dat/options for
|
||||||
|
# potential use by old port-specific code that isn't being actively maintained
|
||||||
date.h
|
date.h
|
||||||
|
# obsolete but can still be built by 'makedefs' for reference purposes
|
||||||
onames.h
|
onames.h
|
||||||
pm.h
|
pm.h
|
||||||
nhlua.h
|
# these are obsolete--or now reside elsewhere--but are still listed here to be
|
||||||
|
# ignored in case the directory contains remnants of building an older version
|
||||||
|
dgn_comp.h
|
||||||
|
lev_comp.h
|
||||||
|
vis_tab.h
|
||||||
|
tile.h
|
||||||
|
win32api.h
|
||||||
|
# really obsolete...
|
||||||
|
.cvsignore
|
||||||
|
|||||||
@@ -319,7 +319,7 @@ tilemap: tilemap.o $(OBJDIR)/objects.o $(OBJDIR)/monst.o $(OBJDIR)/drawing.o
|
|||||||
|
|
||||||
tiletext.o: ../win/share/tiletext.c $(CONFIG_H) ../win/share/tile.h
|
tiletext.o: ../win/share/tiletext.c $(CONFIG_H) ../win/share/tile.h
|
||||||
$(CC) $(CFLAGS) -I../win/share -c ../win/share/tiletext.c -o $@
|
$(CC) $(CFLAGS) -I../win/share -c ../win/share/tiletext.c -o $@
|
||||||
tiletxt.o: ../win/share/tiletxt.c $(HACK_H)
|
tiletxt.o: ../win/share/tiletxt.c ../win/share/tilemap.c $(HACK_H)
|
||||||
$(CC) $(CFLAGS) -I../win/share -c ../win/share/tiletxt.c -o $@
|
$(CC) $(CFLAGS) -I../win/share -c ../win/share/tiletxt.c -o $@
|
||||||
tilemap.o: ../win/share/tilemap.c $(HACK_H)
|
tilemap.o: ../win/share/tilemap.c $(HACK_H)
|
||||||
$(CC) $(CFLAGS) -c ../win/share/tilemap.c -o $@
|
$(CC) $(CFLAGS) -c ../win/share/tilemap.c -o $@
|
||||||
|
|||||||
Reference in New Issue
Block a user