correct some conditional code in hints macOS.370

This commit is contained in:
nhmall
2022-06-15 18:58:44 -04:00
parent 57390a7b2c
commit 1f2033562d
+7 -5
View File
@@ -134,11 +134,14 @@ NHCFLAGS+=-DNOMAIL
#NHCFLAGS+=-DLIVELOG #NHCFLAGS+=-DLIVELOG
ifdef MAKEFILE_SRC ifdef MAKEFILE_SRC
ifeq "$(USE_CURSESLIB)" "1"
# default # default
CURSESLIB = -lncurses CURSESLIB = -lncurses
ifeq "$(CURSES_UNICODE)" "sys" ifeq "$(CURSES_UNICODE)" "sys"
NHCFLAGS+=-DCURSES_UNICODE NHCFLAGS+=-DCURSES_UNICODE
WINLIB += $(CURSESLIB)
else
ifeq "$(USE_CURSESLIB)" "1"
NHCFLAGS+=-DCURSES_UNICODE
else else
# 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.
@@ -158,11 +161,7 @@ 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 #not CURSES_UNICODE=0
endif #not CURSES_UNICODE=sys
endif #USE_CURSESLIB endif #USE_CURSESLIB
endif #MAKEFILE_SRC
ifdef MAKEFILE_SRC
ifneq "$(CURSES_UNICODE)" "0" ifneq "$(CURSES_UNICODE)" "0"
ifdef CURSESLIB ifdef CURSESLIB
PKGCFLAGS= PKGCFLAGS=
@@ -192,7 +191,10 @@ PKGCFLAGS += $(HOMEBREW_CFLAGS) $(MACPORTS_CFLAGS)
endif #CURSESLIB endif #CURSESLIB
else # CURSES_UNICODE else # CURSES_UNICODE
WINLIB += $(CURSESLIB) WINLIB += $(CURSESLIB)
$(info WINLIB=$(WINLIB))
$(info CURSESLIB=$(CURSESLIB))
endif #not CURSES_UNICODE=0 endif #not CURSES_UNICODE=0
endif #not 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