Header consolidation - main.h, misc.h, and share.h merge to advent.h.

For a project this small size with a small type ontology, it's better
C style to have one header where all the assumptions about types and
structures are immediately visible.

This is a first step towards turning all that global state into a handful
of structures - probably just two, one saveable as a binary game state.
This commit is contained in:
Eric S. Raymond 2017-06-02 15:01:52 -04:00
parent 4209b82c5a
commit d402e09411
10 changed files with 53 additions and 64 deletions

View file

@ -9,7 +9,7 @@ ifeq ($(UNAME_S),Linux)
endif
OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control advent.h funcs.h
.c.o:
$(CC) $(CCFLAGS) -O $(DBX) -c $<
@ -17,17 +17,17 @@ SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text contro
advent: $(OBJS) database.o
$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) $(LIBS)
main.o: main.h misc.h funcs.h database.h
main.o: advent.h funcs.h database.h
init.o: misc.h main.h share.h funcs.h database.h
init.o: advent.h funcs.h database.h
actions1.o: misc.h main.h share.h funcs.h database.h
actions1.o: advent.h funcs.h database.h
actions2.o: misc.h main.h share.h funcs.h
actions2.o: advent.h funcs.h
score.o: misc.h main.h share.h database.h
score.o: advent.h database.h
misc.o: misc.h main.h database.h
misc.o: advent.h database.h
database.o: database.h