From: nhmall <nhmall@nethack.org>
Date: Fri, 5 Feb 2021 14:38:35 +0000 (-0500)
Subject: potential fix for the macOS issue encountered
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8785792bd0da73b4362b654602bffde8b1ae5f6;p=nethack

potential fix for the macOS issue encountered

Some build flags were unintentionally overlooked in a previous change
---

diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020
index a743049b5..0e4b64726 100755
--- a/sys/unix/hints/macOS.2020
+++ b/sys/unix/hints/macOS.2020
@@ -54,24 +54,28 @@ endif
 #-INCLUDE compiler.2020
 
 # NetHack sources control
-CFLAGS+=-DDLB
-CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
-CFLAGS+=-DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB
-CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
-#CFLAGS+=-DTIMED_DELAY
-#CFLAGS+=-DDUMPLOG
-#CFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
-CFLAGS+=-DGREPPATH=\"/usr/bin/grep\"
-#CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
-CFLAGS+=-DNOMAIL
-#CFLAGS+=-DEXTRA_SANITY_CHECKS
-#CFLAGS+=-DEDIT_GETLIN
-#CFLAGS+=-DSCORE_ON_BOTL
-#CFLAGS+=-DMSGHANDLER
-#CFLAGS+=-DTTY_TILES_ESCCODES
-#CFLAGS+=-DTTY_SOUND_ESCCODES
-
-CFLAGS+= $(WINCFLAGS)   #WINCFLAGS set from multiw-2.2020
+NHCFLAGS+=-DDLB
+NHCFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
+NHCFLAGS+=-DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB
+NHCFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
+#NHCFLAGS+=-DTIMED_DELAY
+#NHCFLAGS+=-DDUMPLOG
+#NHCFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
+NHCFLAGS+=-DGREPPATH=\"/usr/bin/grep\"
+#NHCFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
+NHCFLAGS+=-DNOMAIL
+#NHCFLAGS+=-DEXTRA_SANITY_CHECKS
+#NHCFLAGS+=-DEDIT_GETLIN
+#NHCFLAGS+=-DSCORE_ON_BOTL
+#NHCFLAGS+=-DMSGHANDLER
+#NHCFLAGS+=-DTTY_TILES_ESCCODES
+#NHCFLAGS+=-DTTY_SOUND_ESCCODES
+
+CFLAGS+= $(WINCFLAGS)  #WINCFLAGS set from multiw-2.2020
+CFLAGS+= $(NHCFLAGS)
+
+CCXXFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.2020
+CCXXFLAGS+= $(NHCFLAGS)
 
 VARDATND =
 VARDATND0 =