From: nhmall <nhmall@nethack.org>
Date: Mon, 5 Oct 2020 00:48:09 +0000 (-0400)
Subject: updates for LIBNH build
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8961b00678199549491002bb880c2e0c845f27b;p=nethack

updates for LIBNH build
---

diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020
index 2780cbb77..c8312452c 100755
--- a/sys/unix/hints/linux.2020
+++ b/sys/unix/hints/linux.2020
@@ -172,10 +172,15 @@ LIBNHSYSSRC = ../sys/lib/libnethackmain.c \
 		../win/shim/winshim.c
 LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
                 unixres.o winshim.o
+#don't bother building the game executable as it will fail
+#without winshim
+override GAME=
 MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
 libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
 	$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
 	@echo "$@ built."
+libnethackmain.o : ../sys/lib/libnethackmain.c $(HACK_H)
+	$(CC) $(CFLAGS) -c -o$@ $<
 winshim.o : ../win/shim/winshim.c $(HACK_H)
 	$(CC) $(CFLAGS) -c -o$@ $<
 endif  # BUILD_LIBNH
diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020
index 7d2005832..31673dded 100755
--- a/sys/unix/hints/macOS.2020
+++ b/sys/unix/hints/macOS.2020
@@ -179,13 +179,18 @@ LIBNHSYSSRC = ../sys/lib/libnethackmain.c \
 		../win/shim/winshim.c
 LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
                 unixres.o winshim.o
+#don't bother building the game executable as it will fail
+#without winshim
+override GAME=
 MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
 libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
 	$(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
 	@echo "$@ built."
+libnethackmain.o : ../sys/lib/libnethackmain.c $(HACK_H)
+	$(CC) $(CFLAGS) -c -o$@ $<
 winshim.o : ../win/shim/winshim.c $(HACK_H)
 	$(CC) $(CFLAGS) -c -o$@ $<
-endif  # BUILD_LIBNH
+endif  # WANT_LIBNH
 
 WANT_BUNDLE=1
 ifdef WANT_SHARE_INSTALL