From c40b282517d1c4f44017fbbaeef0fc95e1fcb429 Mon Sep 17 00:00:00 2001 From: Iku Date: Sat, 18 Nov 2017 23:29:54 +0100 Subject: Always use system ncurses on macOS Removing the unneeded dependency on Homebrew ncursesw, as macOS system ncurses also includes wide character support and is compatible with sc-im. System ncurses is already used for the vanilla build: https://github.com/andmarti1424/sc-im/pull/183 --- src/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index af7355e..e3770c7 100755 --- a/src/Makefile +++ b/src/Makefile @@ -92,7 +92,10 @@ ifneq (, $(shell which pkg-config)) # Any system with pkg-config # NOTE: ncursesw (required) - ifneq ($(shell pkg-config --exists ncursesw || echo 'no'),no) + ifeq ($(shell uname -s),Darwin) + # macOS' ncurses is built with wide-char support + LDFLAGS += -lncurses + else 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) -- cgit v1.2.3 From a5f6b6232e829911375c5eed7ac7f52c3b4d6e0d Mon Sep 17 00:00:00 2001 From: Iku Date: Sat, 18 Nov 2017 23:45:11 +0100 Subject: Update readme for vanilla ncurses See c40b282517d1c4f44017fbbaeef0fc95e1fcb429 --- Readme.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Readme.md b/Readme.md index b82816e..c944f0a 100644 --- a/Readme.md +++ b/Readme.md @@ -43,12 +43,6 @@ SC-IM stands for Spreadsheet Calculator Improvised. :-) vim /src/Makefile ``` -* Only for OSX users who dont use Homebrew: -``` - brew install ncurses - brew link ncurses -``` - * Inside /src folder run: ``` make -- cgit v1.2.3