xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jjthrash/osx-fixes'

Browse Source
This commit is contained in:
Maxime Coste 2014-04-03 19:03:49 +01:00
commit c0e7975f62
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Makefile
View File

@ -10,15 +10,24 @@ sharedir := $(DESTDIR)$(PREFIX)/share/kak
docdir := $(DESTDIR)$(PREFIX)/share/doc/kak docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -pedantic 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) ifeq ($(os),Cygwin)
LIBS += -lboost_regex-mt LIBS += -lboost_regex-mt
else ifeq ($(os),Darwin)
LIBS += -lboost_regex-mt
else else
LIBS += -lboost_regex LIBS += -lboost_regex
endif endif
debug ?= yes debug ?= yes
ifeq ($(debug),yes) ifeq ($(debug),yes)
CXXFLAGS += -DKAK_DEBUG CXXFLAGS += -DKAK_DEBUG

2
src/keys.cc
View File

@ -17,7 +17,7 @@ Key canonicalize_ifn(Key key)
} }
using KeyAndName = std::pair<const char*, Codepoint>; using KeyAndName = std::pair<const char*, Codepoint>;
static constexpr KeyAndName keynamemap[] = { static const KeyAndName keynamemap[] = {
{ "ret", '\r' }, { "ret", '\r' },
{ "space", ' ' }, { "space", ' ' },
{ "tab", '\t' }, { "tab", '\t' },

5
src/ncurses.cc
View File

@ -10,7 +10,12 @@
#define NCURSES_OPAQUE 0 #define NCURSES_OPAQUE 0
#define NCURSES_INTERNALS #define NCURSES_INTERNALS
#ifdef __APPLE__
#include <ncurses.h>
#else
#include <ncursesw/ncurses.h> #include <ncursesw/ncurses.h>
#endif
#include <signal.h> #include <signal.h>
#include <termios.h> #include <termios.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

2
src/normal.cc
View File

@ -864,7 +864,7 @@ void select_object(Context& context, int param)
return select<mode>(context, std::bind(sel.func, _1, _2, flags)); return select<mode>(context, std::bind(sel.func, _1, _2, flags));
} }
static constexpr struct static const struct
{ {
CodepointPair pair; CodepointPair pair;
Codepoint name; Codepoint name;