# git submodule update --recursive --remote
#
# but this should seldom be necessary as that library is pretty stable.
+#
+# You will also need Python 3 YAML. Under Debian or ubuntu:
+#
+# apt-get install python3-yaml
+#
+# If you have pip installed,
+#
+# pip3 install PyYAML
+#
+# If you are using MacPorts on OS X:
+# port install py3{5,6}-yaml as appropriate for your Python 3 version.
+#
+# To build with save/resume disabled, pass CCFLAGS="-D ADVENT_NOSAVE"
+
+.PHONY: debug indent release refresh dist linty html clean
VERS=1.0
CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE
+CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -O2
LIBS=
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
LIBS=-lrt
endif
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h sizes.h adventure.text Makefile control linenoise/linenoise.[ch]
+OBJS=main.o init.o actions.o score.o misc.o saveresume.o
+CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o
+SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control linenoise/linenoise.[ch] make_dungeon.py
.c.o:
$(CC) $(CCFLAGS) $(DBX) -c $<
-advent: $(OBJS) database.o linenoise.o
- $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o linenoise.o $(LDFLAGS) $(LIBS)
+advent: $(OBJS) linenoise.o dungeon.o
+ $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o linenoise.o $(LDFLAGS) $(LIBS)
+
+main.o: advent.h dungeon.h
-main.o: advent.h database.h database.c sizes.h
+init.o: advent.h dungeon.h
-init.o: advent.h database.h database.c sizes.h
+actions.o: advent.h dungeon.h
-actions1.o: advent.h database.h database.c sizes.h
+score.o: advent.h dungeon.h
-actions2.o: advent.h database.h database.c sizes.h
+misc.o: advent.h dungeon.h
-score.o: advent.h database.h database.c sizes.h
+cheat.o: advent.h dungeon.h
-misc.o: advent.h database.h database.c sizes.h
+saveresume.o: advent.h dungeon.h
-database.o: database.c database.h sizes.h
- $(CC) $(CCFLAGS) $(DBX) -c database.c
+dungeon.o: dungeon.c dungeon.h
+ $(CC) $(CCFLAGS) $(DBX) -c dungeon.c
-database.c database.h: dungeon
- ./dungeon
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml
+ python3 make_dungeon.py
linenoise.o: linenoise/linenoise.h
- $(CC) $(CCFLAGS) $(DBX) -c linenoise/linenoise.c
+ $(CC) -c linenoise/linenoise.c
-dungeon: dungeon.c
- $(CC) $(CCFLAGS) -o $@ $<
+linenoise-dbg: linenoise/linenoise.h
+ $(CC) $(CCFLAGS) -c linenoise/linenoise.c
clean:
- rm -f *.o advent *.html database.[ch] dungeon *.gcno *.gcda
+ rm -f *.o advent cheat *.html *.gcno *.gcda
+ rm -f dungeon.c dungeon.h
rm -f README advent.6 MANIFEST *.tar.gz
rm -f *~
+ rm -f .*~
+ rm -rf coverage advent.info
cd tests; $(MAKE) --quiet clean
-check: advent
+
+cheat: $(CHEAT_OBJS) linenoise.o dungeon.o
+ $(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o dungeon.o $(LDFLAGS) $(LIBS)
+
+check: advent cheat
cd tests; $(MAKE) --quiet
+coverage: debug cheat
+ cd tests; $(MAKE) coverage --quiet
+
.SUFFIXES: .adoc .html .6
# Requires asciidoc and xsltproc/docbook stylesheets.
html: advent.html history.html hints.html
# README.adoc exists because that filename is magic on GitLab.
-DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc hints.adoc advent.6
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc notes.adoc hints.adoc advent.6
TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
# Can't use GNU tar's --transform, needs to build under Alpine Linux.
(tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
@(rm advent-$(VERS))
-release: advent-$(VERS).tar.gz advent.html history.html hints.html
+indent:
+ astyle -n -A3 --pad-header --min-conditional-indent=1 --pad-oper *.c
+
+release: advent-$(VERS).tar.gz advent.html history.html hints.html notes.html
shipper version=$(VERS) | sh -e -x
-refresh: advent.html
+refresh: advent.html notes.html history.html
shipper -N -w version=$(VERS) | sh -e -x
dist: advent-$(VERS).tar.gz
-debug: CCFLAGS += -O0 --coverage
-debug: advent
+linty: CCFLAGS += -W
+linty: CCFLAGS += -Wall
+linty: CCFLAGS += -Wextra
+linty: CCFLAGS += -Wundef
+linty: CCFLAGS += -Wstrict-prototypes
+linty: CCFLAGS += -Wmissing-prototypes
+linty: CCFLAGS += -Wmissing-declarations
+linty: CCFLAGS += -Wshadow
+linty: CCFLAGS += -Wfloat-equal
+linty: CCFLAGS += -Wcast-align
+linty: CCFLAGS += -Wwrite-strings
+linty: CCFLAGS += -Waggregate-return
+linty: CCFLAGS += -Wcast-qual
+linty: CCFLAGS += -Wswitch-enum
+linty: CCFLAGS += -Wwrite-strings
+linty: CCFLAGS += -Wunreachable-code
+linty: CCFLAGS += -Winit-self
+linty: CCFLAGS += -Wpointer-arith
+linty: advent
+
+debug: CCFLAGS += -O0 --coverage -ggdb
+debug: linty
+debug: cheat
+
+debug-ln: linenoise-dbg debug