Merge branch 'master' of git://github.com/hoop33/kakoune

This commit is contained in:
Maxime Coste 2017-01-05 14:36:55 +00:00
commit 3123dbf4c2

View File

@ -38,8 +38,8 @@ os := $(shell uname)
ifeq ($(os),Darwin) ifeq ($(os),Darwin)
LIBS += -lncurses -lboost_regex-mt LIBS += -lncurses -lboost_regex-mt
CPPFLAGS += -I/usr/local/opt/ncurses/include -I/usr/local/opt/boost/include CPPFLAGS += -I$(PREFIX)/opt/ncurses/include -I$(PREFIX)/opt/boost/include
LDFLAGS += -L/usr/local/opt/ncurses/lib -L/usr/local/opt/boost/lib LDFLAGS += -L$(PREFIX)/opt/ncurses/lib -L$(PREFIX)/opt/boost/lib
else ifeq ($(os),FreeBSD) else ifeq ($(os),FreeBSD)
LIBS += -ltinfow -lncursesw -lboost_regex LIBS += -ltinfow -lncursesw -lboost_regex
CPPFLAGS += -I/usr/local/include CPPFLAGS += -I/usr/local/include