From: Aaron Traas Date: Mon, 3 Dec 2018 18:51:02 +0000 (-0500) Subject: Makefile fix for macOS 10.14 X-Git-Tag: 1.7~2 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F274%2Fhead;p=open-adventure.git Makefile fix for macOS 10.14 --- diff --git a/Makefile b/Makefile index 8836d1a..d196a56 100644 --- 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) +# 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