diff options
| author | mongo <andmarti@gmail.com> | 2017-07-28 15:02:25 -0300 |
|---|---|---|
| committer | mongo <andmarti@gmail.com> | 2017-07-28 15:02:25 -0300 |
| commit | adcb4123f478d63c7a1cdefe08a39efce9d02f65 (patch) | |
| tree | 99711b3bf988986c23ceae25e524a2e8f92bf37d | |
| parent | a7a5c82c2ead2a2d3e376fe88de48c8231b83284 (diff) | |
| parent | fd70c8659e150174f4a24cfda3abf2c5d0fba979 (diff) | |
Merge branch 'freeze' of https://github.com/andmarti1424/sc-im into freeze
| -rwxr-xr-x | src/Makefile | 14 | ||||
| -rw-r--r-- | src/color.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index bc65db0..82b3ea5 100755 --- a/src/Makefile +++ b/src/Makefile @@ -1,8 +1,8 @@ # Specify the name of the resulting executable file -name = scim +name = sim # The base directory where everything should be installed. -prefix = /usr/local +prefix = /usr/local/stow/sc-im EXDIR = $(prefix)/bin HELPDIR = $(prefix)/share/$(name) @@ -13,10 +13,10 @@ MANDIR = $(prefix)/share/man/man1 # Change these to your liking or use `make CC=gcc` etc #CC = cc -#YACC = bison -y +YACC = bison -y #SED = sed -LDLIBS += -lm +LDLIBS += -lm -lncursesw -lzip -lxml2 CFLAGS += -Wall -g CFLAGS += -DNCURSES @@ -26,7 +26,7 @@ CFLAGS += -DHELP_PATH=\"$(HELPDIR)\" CFLAGS += -DLIBDIR=\"$(LIBDIR)\" # Sets default pager, e.g. 'less' or 'more' -CFLAGS += -DDFLT_PAGER=\"less\" +CFLAGS += -DDFLT_PAGER=\"pager\" # Sets default editor. Its use in case EDITOR env variable is not set CFLAGS += -DDFLT_EDITOR=\"vim\" # Comment out to disable color support @@ -74,8 +74,8 @@ 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 # Check for gnuplot existance diff --git a/src/color.c b/src/color.c index cbd34e7..3ce5e52 100644 --- a/src/color.c +++ b/src/color.c @@ -260,7 +260,7 @@ void color_cell(int r, int c, int rf, int cf, char * str) { if (n->ucolor == NULL) { n->ucolor = (struct ucolor *) malloc(sizeof(struct ucolor)); n->ucolor->fg = WHITE; - n->ucolor->bg = DEFAULT_COLOR; + n->ucolor->bg = BLACK; n->ucolor->bold = 0; n->ucolor->dim = 0; n->ucolor->reverse = 0; |