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

Only pass ncurses compilation flags to ncurses_ui.cc

Browse Source
This commit is contained in:
Maxime Coste 2019-03-26 13:04:08 +11:00
parent b531bab1ce
commit 688afee41b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile
View File

@ -60,7 +60,8 @@ os := $(shell uname)
ifeq ($(os),Darwin) ifeq ($(os),Darwin)
LIBS += -lncurses LIBS += -lncurses
CPPFLAGS += -I$(PREFIX)/opt/ncurses/include -I/opt/local/include NCURSES_CFLAGS += -I$(PREFIX)/opt/ncurses/include
CPPFLAGS += -I/opt/local/include
LDFLAGS += -L$(PREFIX)/opt/ncurses/lib -L/opt/local/lib LDFLAGS += -L$(PREFIX)/opt/ncurses/lib -L/opt/local/lib
else ifeq ($(os),FreeBSD) else ifeq ($(os),FreeBSD)
LIBS += -ltinfow -lncursesw LIBS += -ltinfow -lncursesw
@ -81,7 +82,7 @@ else
endif endif
LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs ncursesw) LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs ncursesw)
CPPFLAGS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags ncursesw) NCURSES_CFLAGS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags ncursesw)
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
endif endif
@ -100,6 +101,8 @@ kak$(suffix) : $(objects) .version.o
.%$(suffix).o: %.cc .%$(suffix).o: %.cc
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -MP -MF $(addprefix ., $(<:.cc=$(suffix).d)) -c -o $@ $< $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -MP -MF $(addprefix ., $(<:.cc=$(suffix).d)) -c -o $@ $<
.ncurses_ui$(suffix).o: CPPFLAGS += $(NCURSES_CFLAGS)
.version.o: .version.cc .version.o: .version.cc
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<