From: nhmall Date: Sun, 11 Oct 2020 17:42:12 +0000 (-0400) Subject: more integration suggestion adoption X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9395dcd23c4dd585e4ea42181069fbc38b4f796;p=nethack more integration suggestion adoption --- diff --git a/sys/libnh/libnhmain.c b/sys/libnh/libnhmain.c index 200159955..fe5ea55e7 100644 --- a/sys/libnh/libnhmain.c +++ b/sys/libnh/libnhmain.c @@ -7,7 +7,6 @@ #include "hack.h" #include "dlb.h" -#include "date.h" #include #include diff --git a/sys/unix/hints/include/cross-post.2020 b/sys/unix/hints/include/cross-post.2020 index add7de1d0..b2d45c787 100644 --- a/sys/unix/hints/include/cross-post.2020 +++ b/sys/unix/hints/include/cross-post.2020 @@ -142,8 +142,7 @@ $(TARGETPFX)unixunix.o : ../sys/unix/unixunix.c $(HACK_H) $(TARGETPFX)ioctl.o : ../sys/share/ioctl.c $(HACK_H) $(TARGETPFX)unixtty.o : ../sys/share/unixtty.c $(HACK_H) $(TARGETPFX)winshim.o : ../win/shim/winshim.c $(HACK_H) -$(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c \ - $(HACK_H) ../include/date.h +$(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) endif # CROSS_TO_WASM # diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020 index f730ff602..2d536f4ff 100755 --- a/sys/unix/hints/linux.2020 +++ b/sys/unix/hints/linux.2020 @@ -228,7 +228,7 @@ ifdef WANT_LIBNH libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a @echo "$@ built." -libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) ../include/date.h +libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) $(CC) $(CFLAGS) -c -o$@ $< winshim.o : ../win/shim/winshim.c $(HACK_H) $(CC) $(CFLAGS) -c -o$@ $< diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020 index fb739731e..85f9b3208 100755 --- a/sys/unix/hints/macOS.2020 +++ b/sys/unix/hints/macOS.2020 @@ -298,7 +298,7 @@ ifdef WANT_LIBNH libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a @echo "$@ built." -libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) ../include/date.h +libnhmain.o : ../sys/libnh/libnhmain.c $(HACK_H) $(CC) $(CFLAGS) -c -o$@ $< winshim.o : ../win/shim/winshim.c $(HACK_H) $(CC) $(CFLAGS) -c -o$@ $<