diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.native (renamed from Makefile.generic) | 12 | ||||
| -rw-r--r-- | nnn.c | 4 |
3 files changed, 11 insertions, 8 deletions
@@ -3,7 +3,7 @@ VERSION = 1.1 PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man -CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter +CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter LDLIBS = -lreadline ifeq ($(shell pkg-config ncursesw && echo 1),1) @@ -13,7 +13,6 @@ else LDLIBS += -lncurses endif - DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE LOCALCONFIG = config.h SRC = nnn.c diff --git a/Makefile.generic b/Makefile.native index c4e8fdd..310f138 100644 --- a/Makefile.generic +++ b/Makefile.native @@ -1,14 +1,16 @@ -VERSION = 1.0 +VERSION = 1.1 PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man -CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter +CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter LDLIBS = -lreadline -ifeq ($(shell uname), Darwin) - LDLIBS += -lncurses + +ifeq ($(shell pkg-config ncursesw && echo 1),1) + CFLAGS += $(shell pkg-config --cflags ncursesw) + LDLIBS += $(shell pkg-config --libs ncursesw) else - LDLIBS += -lncursesw + LDLIBS += -lncurses endif DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE @@ -28,7 +28,9 @@ #include <wchar.h> #include <readline/readline.h> -#define __USE_XOPEN_EXTENDED +#ifndef __USE_XOPEN_EXTENDED +#define __USE_XOPEN_EXTENDED 1 +#endif #include <ftw.h> #ifdef DEBUG |