From d2e9486f2d12c09b4951458a45b20321e4b85a92 Mon Sep 17 00:00:00 2001 From: Jimmy Thrasher Date: Wed, 2 Apr 2014 20:19:49 -0400 Subject: [PATCH 2/4] Fix some more constexpr issues for clang --- src/keys.cc | 2 +- src/normal.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/keys.cc b/src/keys.cc index cecf9634..e3b2f111 100644 --- a/src/keys.cc +++ b/src/keys.cc @@ -17,7 +17,7 @@ Key canonicalize_ifn(Key key) } using KeyAndName = std::pair; -static constexpr KeyAndName keynamemap[] = { +static const KeyAndName keynamemap[] = { { "ret", '\r' }, { "space", ' ' }, { "tab", '\t' }, diff --git a/src/normal.cc b/src/normal.cc index 73346a75..b0794e8f 100644 --- a/src/normal.cc +++ b/src/normal.cc @@ -864,7 +864,7 @@ void select_object(Context& context, int param) return select(context, std::bind(sel.func, _1, _2, flags)); } - static constexpr struct + static const struct { CodepointPair pair; Codepoint name; From 0bb46c896827949a5cb18c3b1d84a4da502d0803 Mon Sep 17 00:00:00 2001 From: Jimmy Thrasher Date: Wed, 2 Apr 2014 20:54:27 -0400 Subject: [PATCH 3/4] Detect Darwin in the Makefile and plan accordingly --- src/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 40af3ce8..7ff4eb00 100644 --- a/src/Makefile +++ b/src/Makefile @@ -10,15 +10,24 @@ sharedir := $(DESTDIR)$(PREFIX)/share/kak docdir := $(DESTDIR)$(PREFIX)/share/doc/kak CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -pedantic -LIBS += -lncursesw -os := $(shell uname -o) +os := $(shell uname) + +ifeq ($(os),Darwin) + LIBS += -lncurses +else + LIBS += -lncursesw +endif + ifeq ($(os),Cygwin) LIBS += -lboost_regex-mt +else ifeq ($(os),Darwin) + LIBS += -lboost_regex-mt else LIBS += -lboost_regex endif + debug ?= yes ifeq ($(debug),yes) CXXFLAGS += -DKAK_DEBUG From 43b395533fcf8ae34d702de6238b6039fe1fa821 Mon Sep 17 00:00:00 2001 From: Jimmy Thrasher Date: Wed, 2 Apr 2014 20:54:49 -0400 Subject: [PATCH 4/4] Use plain libncurses with Apple --- src/ncurses.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ncurses.cc b/src/ncurses.cc index 4d59707a..4380c419 100644 --- a/src/ncurses.cc +++ b/src/ncurses.cc @@ -10,7 +10,12 @@ #define NCURSES_OPAQUE 0 #define NCURSES_INTERNALS +#ifdef __APPLE__ +#include +#else #include +#endif + #include #include #include