projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
dd1d69a
)
Makefile fix for macOS 10.14
274/head
author
Aaron Traas
<aaron@traas.org>
Mon, 3 Dec 2018 18:51:02 +0000
(13:51 -0500)
committer
Aaron Traas
<aaron@traas.org>
Mon, 3 Dec 2018 18:51:02 +0000
(13:51 -0500)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 8836d1ac0874891555bae267907dfa6b418cc1fa..d196a56bdec8ba333e9455d8256efe713ccf372b 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,6
+12,12
@@
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
SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control make_dungeon.py templates/*.tpl
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 templates/*.tpl