From 27c778ea2fd7697c741e16fb9fea30c0892bfa84 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Thu, 5 Dec 2019 22:24:29 -0500
Subject: [PATCH] add creation of nhlua.h to msdos cross-compile
 Makefile1.cross

---
 sys/msdos/Makefile1.cross | 14 +++++++++++++-
 sys/msdos/Makefile2.cross |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/sys/msdos/Makefile1.cross b/sys/msdos/Makefile1.cross
index 8c9324076..a15a495ed 100644
--- a/sys/msdos/Makefile1.cross
+++ b/sys/msdos/Makefile1.cross
@@ -31,6 +31,7 @@ HOBJ = host_o
 DAT  = ../dat
 DOC  = ../doc
 INCL = ../include
+LIB  = ../lib
 MSYS = ../sys/msdos
 SRC  = ../src
 SSHR = ../sys/share
@@ -301,9 +302,20 @@ $(HOST_O)utility.tag: $(INCL)/date.h $(INCL)/trap.h $(INCL)/onames.h \
 tileutil: $(U)gif2txt $(U)txt2ppm
 	@echo Optional tile development utilities are up to date.
 
-$(HOST_O)prereq.tag: hobj.tag $(U)makedefs $(HOST_O)utility.tag $(DAT)/nhdat
+$(HOST_O)prereq.tag: $(INCL)/nhlua.h hobj.tag $(U)makedefs \
+			$(HOST_O)utility.tag $(DAT)/nhdat
 	echo prereq done >$@
 
+$(INCL)/nhlua.h:
+	cd $(INCL); \
+	echo '/* nhlua.h - generated by Makefile1.cross */' > $@; \
+	echo '#include \"../lib/lua-5.3.5/src/lua.h\"' >> $@; \
+	sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < $(LIB)/lua-5.3.5/src/lua.h >> $@; \
+	echo '#include \"../lib/lua-5.3.5/src/lualib.h\"' >> $@; \
+	echo '#include \"../lib/lua-5.3.5/src/lauxlib.h\"' >> $@; \
+	echo '/*nhlua.h*/' >> $@; \
+	cd $(SRC)
+
 #==========================================
 #  Other host targets.
 #==========================================
diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross
index f9a848e13..9a88c16f9 100644
--- a/sys/msdos/Makefile2.cross
+++ b/sys/msdos/Makefile2.cross
@@ -71,6 +71,7 @@ HOBJ = host_o
 DAT  = ../dat
 DOC  = ../doc
 INCL = ../include
+LIB  = ../lib
 MSYS = ../sys/msdos
 SRC  = ../src
 SSHR = ../sys/share