updates for LIBNH build

diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020
index 2780cbb77c265ad5c6e55f6c178a5a78dda1470a..c8312452ccda11c567e52952fb85c8b92c3504f9 100755 (executable)
--- 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 7d20058325e4f88e70fbc84fc895461a10a50248..31673dded6a6f1375bda25c3c12877edb0017b93 100755 (executable)
--- 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