From 5bd3c15ebc8b8d255c148486c64fa9142e067673 Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 4 Aug 2020 16:07:04 -0400 Subject: [PATCH] macOS.2020 tweak Eliminate the use of WINLIB0 and the use of sort for clearing of duplicate strings within it. --- sys/unix/hints/macOS.2020 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020 index dd0ffd5ee..e02026563 100755 --- a/sys/unix/hints/macOS.2020 +++ b/sys/unix/hints/macOS.2020 @@ -19,7 +19,7 @@ # One possible way: brew install xquartz # # - You'll need to obtain and install Qt if you want Qt support -# One possible way: Brew install Qt +# One possible way: brew install Qt # # - You'll need to obtain and install the ncurses development libraries # if you want curses window port support. @@ -187,15 +187,14 @@ endif # WANT_WIN_CHAIN WINSRC = WINOBJ0 = WINLIB = -WINLIB0 = VARDATND = VARDATND0 = -WINCURSESLIB=-lncurses +WINCURSESLIB = ifdef WANT_WIN_TTY WINSRC += $(WINTTYSRC) WINOBJ0 += $(WINTTYOBJ) -WINLIB0 += $(WINCURSESLIB) +WINCURSESLIB = -lncurses else # !WANT_WIN_TTY CFLAGS += -DNOTTYGRAPHICS endif # !WANT_WIN_TTY @@ -204,11 +203,12 @@ ifdef WANT_WIN_CURSES CFLAGS += -DCURSES_GRAPHICS WINSRC += $(WINCURSESSRC) WINOBJ0 += $(WINCURSESOBJ) -WINLIB0 += $(WINCURSESLIB) +WINCURSESLIB = -lncurses endif -# prevent duplicates in WINLIB from WINLIB0 -WINLIB += $(sort $(WINLIB0)) +ifdef WINCURSESLIB +WINLIB += $(WINCURSESLIB) +endif ifdef WANT_WIN_X11 USE_XPM=1