nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

another ncursesw follow-up

Browse Source
This commit is contained in:
nhmall
2022-06-02 17:14:42 -04:00
parent 168ee4c9a8
commit 57cfd7e7ed
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sys/unix/hints/linux.370
View File

@@ -86,7 +86,6 @@ endif
#-INCLUDE compiler.370 #-INCLUDE compiler.370
CURSESLIB =
ifdef WANT_WIN_TTY ifdef WANT_WIN_TTY
USE_CURSESLIB=1 USE_CURSESLIB=1
endif endif
@@ -98,20 +97,32 @@ endif
endif endif
ifeq "$(USE_CURSESLIB)" "1" ifeq "$(USE_CURSESLIB)" "1"
# default
CURSESLIB = -lncurses -ltinfo
# If CURSES_UNICODE is defined, we need ncursesw. # If CURSES_UNICODE is defined, we need ncursesw.
# Without CURSES_UNICODE the following simpler setting works. # Without CURSES_UNICODE the following simpler setting works.
# CURSESLIB = -lncurses -ltinfo # CURSESLIB = -lncurses -ltinfo
ifdef MAKEFILE_SRC ifdef MAKEFILE_SRC
comma:=, comma:=,
NCURSES_LFLAGS = $(shell pkg-config ncursesw --libs) NCURSES_LFLAGS = $(shell pkg-config ncursesw --libs)
CURSESLIB += $(subst -Wl$(comma)-Bsymbolic-functions,,$(NCURSES_LFLAGS)) ifneq (,$(findstring ncursesw, $(NCURSES_LFLAGS)))
ifneq (,$(findstring ncursesw, $(CURSESLIB)))
HAVE_NCURSESW=1 HAVE_NCURSESW=1
else else
HAVE_NCURSESW=0 HAVE_NCURSESW=0
endif endif
WINLIB += $(CURSESLIB) #$(info $(NCURSES_LFLAGS))
#$(info HAVE_NCURSESW=$(HAVE_NCURSESW))
ifeq "$(HAVE_NCURSESW)" "1"
# remove unnecessary -Wl,-Bsymbolic-functions if present
ifneq (,$(findstring -Wl$(comma)-Bsymbolic-functions, $(NCURSES_LFLAGS)))
CURSESLIB = $(subst -Wl$(comma)-Bsymbolic-functions,,$(NCURSES_LFLAGS))
else
CURSESLIB = $(NCURSES_LFLAGS)
endif
#$(info $(CURSESLIB))
endif #HAVE_NCURSESW
endif #MAKEFILE_SRC endif #MAKEFILE_SRC
WINLIB += $(CURSESLIB)
endif #USE_CURSESLIB endif #USE_CURSESLIB
# NetHack sources control # NetHack sources control