projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS update.
[open-adventure.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index ed13d890f47ef9d5251dc1c8448c9e0b918dbf42..d196a56bdec8ba333e9455d8256efe713ccf372b 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,9
+12,15
@@
CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -O2 -D_FORTIFY_SOURCE=
LIBS=$(shell pkg-config --libs libedit)
INC+=$(shell pkg-config --cflags libedit)
LIBS=$(shell pkg-config --libs libedit)
INC+=$(shell pkg-config --cflags libedit)
+# LLVM/Clang on macOS seems to need -ledit flag for linking
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+ CCFLAGS += -ledit
+endif
+
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
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 make_dungeon.py
+SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control make_dungeon.py
templates/*.tpl
.c.o:
$(CC) $(CCFLAGS) $(INC) $(DBX) -c $<
.c.o:
$(CC) $(CCFLAGS) $(INC) $(DBX) -c $<
@@
-39,7
+45,7
@@
saveresume.o: advent.h dungeon.h
dungeon.o: dungeon.c dungeon.h
$(CC) $(CCFLAGS) $(DBX) -c dungeon.c
dungeon.o: dungeon.c dungeon.h
$(CC) $(CCFLAGS) $(DBX) -c dungeon.c
-dungeon.c dungeon.h: make_dungeon.py adventure.yaml
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml
templates/*.tpl
./make_dungeon.py
clean:
./make_dungeon.py
clean:
@@
-58,7
+64,7
@@
cheat: $(CHEAT_OBJS) dungeon.o
check: advent cheat
cd tests; $(MAKE) --quiet
check: advent cheat
cd tests; $(MAKE) --quiet
-coverage: debug
cheat
+coverage: debug
cd tests; $(MAKE) coverage --quiet
.SUFFIXES: .adoc .html .6
cd tests; $(MAKE) coverage --quiet
.SUFFIXES: .adoc .html .6
@@
-74,7
+80,7
@@
coverage: debug cheat
html: advent.html history.html hints.html
# README.adoc exists because that filename is magic on GitLab.
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 notes.adoc hints.adoc advent.6
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc notes.adoc hints.adoc advent.6
INSTALL.adoc
TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
# Can't use GNU tar's --transform, needs to build under Alpine Linux.
TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
# Can't use GNU tar's --transform, needs to build under Alpine Linux.
@@
-105,6
+111,8
@@
linty: CCFLAGS += -Wstrict-prototypes
linty: CCFLAGS += -Wmissing-prototypes
linty: CCFLAGS += -Wmissing-declarations
linty: CCFLAGS += -Wshadow
linty: CCFLAGS += -Wmissing-prototypes
linty: CCFLAGS += -Wmissing-declarations
linty: CCFLAGS += -Wshadow
+linty: CCFLAGS += -Wnull-dereference
+linty: CCFLAGS += -Wjump-misses-init
linty: CCFLAGS += -Wfloat-equal
linty: CCFLAGS += -Wcast-align
linty: CCFLAGS += -Wwrite-strings
linty: CCFLAGS += -Wfloat-equal
linty: CCFLAGS += -Wcast-align
linty: CCFLAGS += -Wwrite-strings