diff options
author | Andrés M <andmarti1424@users.noreply.github.com> | 2017-07-03 17:11:29 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-03 17:11:29 -0300 |
commit | 5e582866fc8a1245902432cd2329970d3bad34fc (patch) | |
tree | 9508fb4cbdcbfe9e2d34f3a37d4a4833a72d5fee | |
parent | f0bdd1064ef9b279d51223dd2acdc1f39618a421 (diff) | |
parent | 0cc9efd181c2adcff8a0a003cef8d4b5e5c5c1dd (diff) |
Merge pull request #183 from yokattana/pr/vanilla-mac
Fix vanilla (non-Homebrew) Mac
-rwxr-xr-x | src/Makefile | 77 | ||||
-rw-r--r-- | src/tui.c | 2 |
2 files changed, 45 insertions, 34 deletions
diff --git a/src/Makefile b/src/Makefile index d013cc8..bc65db0 100755 --- a/src/Makefile +++ b/src/Makefile @@ -16,21 +16,9 @@ MANDIR = $(prefix)/share/man/man1 #YACC = bison -y #SED = sed -ifeq ($(shell uname -s),Darwin) - NCURSES_CFLAGS ?= - NCURSES_LIBS ?= -lncursesw -else ifeq ($(shell pkg-config --exists ncursesw || echo 'no'),no) - NCURSES_CFLAGS ?= - NCURSES_LIBS ?= -lncursesw -else - NCURSES_CFLAGS ?= $(shell pkg-config --cflags ncursesw) - NCURSES_LIBS ?= $(shell pkg-config --libs ncursesw) -endif - -LDLIBS += -lm $(NCURSES_LIBS) +LDLIBS += -lm CFLAGS += -Wall -g -CFLAGS += $(NCURSES_CFLAGS) CFLAGS += -DNCURSES CFLAGS += -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE CFLAGS += -DSNAME=\"$(name)\" @@ -79,40 +67,63 @@ CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\" CFLAGS += -DAUTOBACKUP # Have threads? Set these two, if you want the autobackup feature to work with threads. CFLAGS += -DHAVE_PTHREAD -ifneq ($(shell uname -s),Darwin) -LDLIBS += -pthread -endif -# NOTE: libxml and libzip are required for xlsx file import support -ifneq ($(shell pkg-config --exists libzip libxml-2.0 || echo 'no'),no) -CFLAGS += -DXLSX $(shell pkg-config --cflags libxml-2.0 libzip) -LDLIBS += $(shell pkg-config --libs libxml-2.0 libzip) +ifneq ($(shell uname -s),Darwin) + LDLIBS += -pthread endif # NOTE: libxlsxwriter is required for xlsx file export support ifneq (,$(wildcard /usr/include/xlsxwriter.h)) -CFLAGS += -DXLSX_EXPORT -LDLIBS += -lxlsxwriter + CFLAGS += -DXLSX_EXPORT + LDLIBS += -lxlsxwriter endif -# NOTE: lua support -ifneq ($(shell pkg-config --exists lua51 || echo 'no'),no) -CFLAGS += -DXLUA $(shell pkg-config --cflags lua51) -LDLIBS += $(shell pkg-config --libs lua51) -Wl,--export-dynamic -else ifneq ($(shell pkg-config --exists lua-5.1 || echo 'no'),no) # FreeBSD -CFLAGS += -DXLUA $(shell pkg-config --cflags lua-5.1) -LDLIBS += $(shell pkg-config --libs lua-5.1) -Wl,--export-dynamic +# Check for gnuplot existance +ifneq (, $(shell which gnuplot)) + CFLAGS += -DGNUPLOT endif # dynamic linking (should not be used in FreeBSD ifneq ($(shell uname -s),FreeBSD) -LDLIBS += -ldl + LDLIBS += -ldl endif -# Check for gnuplot existance -ifneq (, $(shell which gnuplot)) -CFLAGS += -DGNUPLOT +ifneq (, $(shell which pkg-config)) + # Any system with pkg-config + + # NOTE: ncursesw (required) + ifneq ($(shell pkg-config --exists ncursesw || echo 'no'),no) + CFLAGS += $(shell pkg-config --cflags ncursesw) + LDLIBS += $(shell pkg-config --libs ncursesw) + else ifneq ($(shell pkg-config --exists ncurses || echo 'no'),no) + # hopefully this includes wide character support then + CFLAGS += $(shell pkg-config --cflags ncurses) + LDLIBS += $(shell pkg-config --libs ncurses) + else + LDLIBS += -lncursesw + endif + + # NOTE: libxml and libzip are required for xlsx file import support + ifneq ($(shell pkg-config --exists libzip libxml-2.0 || echo 'no'),no) + CFLAGS += -DXLSX $(shell pkg-config --cflags libxml-2.0 libzip) + LDLIBS += $(shell pkg-config --libs libxml-2.0 libzip) + endif + + # NOTE: lua support + ifneq ($(shell pkg-config --exists lua51 || echo 'no'),no) + CFLAGS += -DXLUA $(shell pkg-config --cflags lua51) + LDLIBS += $(shell pkg-config --libs lua51) -Wl,--export-dynamic + else ifneq ($(shell pkg-config --exists lua-5.1 || echo 'no'),no) # FreeBSD + CFLAGS += -DXLUA $(shell pkg-config --cflags lua-5.1) + LDLIBS += $(shell pkg-config --libs lua-5.1) -Wl,--export-dynamic + endif +else ifeq ($(shell uname -s),Darwin) + # macOS without pkg-config + + # macOS' ncurses is built with wide-char support + LDFLAGS += -lncurses endif + OBJS = $(patsubst %.c, %.o, $(wildcard *.c) $(wildcard utils/*.c)) gram.o .PHONY : all clean install @@ -81,7 +81,7 @@ SCREEN * sstdout; srange * ranges; void ui_start_screen() { - sstderr = newterm(NULL, stderr, NULL); + sstderr = newterm(NULL, stderr, stdin); noecho(); sstdout = newterm(NULL, stdout, stdin); set_term(sstdout); |