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

another macOS.370 hint tweak

Browse Source
This commit is contained in:
nhmall
2022-06-15 19:07:28 -04:00
parent 1f2033562d
commit 3c9fa6d9d6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/hints/macOS.370
+5 -6
View File
@@ -140,6 +140,9 @@ ifeq "$(CURSES_UNICODE)" "sys"
NHCFLAGS+=-DCURSES_UNICODE NHCFLAGS+=-DCURSES_UNICODE
WINLIB += $(CURSESLIB) WINLIB += $(CURSESLIB)
else else
ifeq "$(CURSES_UNICODE)" "0"
WINLIB += $(CURSESLIB)
else
ifeq "$(USE_CURSESLIB)" "1" ifeq "$(USE_CURSESLIB)" "1"
NHCFLAGS+=-DCURSES_UNICODE NHCFLAGS+=-DCURSES_UNICODE
else else
@@ -153,16 +156,13 @@ HAVE_NCURSESW=1
else else
HAVE_NCURSESW=0 HAVE_NCURSESW=0
endif endif
ifneq "$(CURSES_UNICODE)" "0"
ifeq "$(HAVE_NCURSESW)" "1" ifeq "$(HAVE_NCURSESW)" "1"
CURSESLIB = $(NCURSES_LFLAGS) CURSESLIB = $(NCURSES_LFLAGS)
NHCFLAGS+=-DCURSES_UNICODE NHCFLAGS+=-DCURSES_UNICODE
else else
$(info Attention: CURSES_UNICODE is not being defined without ncursesw) $(info Attention: CURSES_UNICODE is not being defined without ncursesw)
endif #HAVE_NCURSESW endif #HAVE_NCURSESW
endif #not CURSES_UNICODE=0
endif #USE_CURSESLIB endif #USE_CURSESLIB
ifneq "$(CURSES_UNICODE)" "0"
ifdef CURSESLIB ifdef CURSESLIB
PKGCFLAGS= PKGCFLAGS=
ifeq "$(HAVE_HOMEBREW)" "1" ifeq "$(HAVE_HOMEBREW)" "1"
@@ -189,12 +189,11 @@ LFLAGS += $(HOMEBREW_LFLAGS) $(MACPORTS_LFLAGS)
WINLIB += $(HOMEBREW_WINLIB) $(MACPORTS_WINLIB) $(CURSESLIB) WINLIB += $(HOMEBREW_WINLIB) $(MACPORTS_WINLIB) $(CURSESLIB)
PKGCFLAGS += $(HOMEBREW_CFLAGS) $(MACPORTS_CFLAGS) PKGCFLAGS += $(HOMEBREW_CFLAGS) $(MACPORTS_CFLAGS)
endif #CURSESLIB endif #CURSESLIB
else # CURSES_UNICODE
WINLIB += $(CURSESLIB) WINLIB += $(CURSESLIB)
$(info WINLIB=$(WINLIB)) $(info WINLIB=$(WINLIB))
$(info CURSESLIB=$(CURSESLIB)) $(info CURSESLIB=$(CURSESLIB))
endif #not CURSES_UNICODE=0 endif #CURSES_UNICODE=0
endif #not CURSES_UNIODE=sys endif #CURSES_UNIODE=sys
endif #MAKEFILE_SRC endif #MAKEFILE_SRC
CFLAGS+= $(PKGCFLAGS) $(WINCFLAGS) #WINCFLAGS set from multiw-2.370 CFLAGS+= $(PKGCFLAGS) $(WINCFLAGS) #WINCFLAGS set from multiw-2.370