integrate updates made to PR earlier on Oct 4

diff --git a/sys/unix/hints/include/cross-post.2020 b/sys/unix/hints/include/cross-post.2020
index 74228ce6c122dae42d02f539545a35e12f8633a0..a4c2d0a9cd74d0e8cbf8c7a0b960ede1b5b82562 100644 (file)
--- a/sys/unix/hints/include/cross-post.2020
+++ b/sys/unix/hints/include/cross-post.2020
@@ -161,7 +161,7 @@ $(TARGETPFX)recover.exe : $(TARGETPFX)recover.o
        $(TARGET_LINK) $(TARGET_LFLAGS) $(TARGETPFX)recover.o -o $@
 endif  # CROSS_SHARED
 #
-ifdef BUILD_LUA
+ifdef BUILD_TARGET_LUA
 # Lua lib
 $(LUACROSSLIB): $(LUALIBOBJS)
        if [ -f $@ ]; then rm $@; fi;
@@ -206,7 +206,7 @@ $(TARGETPFX)lundump.o : $(LUATOP)/src/lundump.c
 $(TARGETPFX)lutf8lib.o : $(LUATOP)/src/lutf8lib.c
 $(TARGETPFX)lvm.o : $(LUATOP)/src/lvm.c
 $(TARGETPFX)lzio.o : $(LUATOP)/src/lzio.c
-endif  # BUILD_LUA
+endif  # BUILD_TARGET_LUA
 
 ifdef BUILD_PDCURSES
 ifdef WANT_WIN_CURSES

diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020
index 8118c06101158e28af63c26e77689d886795321f..0b1f717374a8bf00dbf5f1235990594ce05b91ce 100644 (file)
--- a/sys/unix/hints/include/cross-pre.2020
+++ b/sys/unix/hints/include/cross-pre.2020
@@ -5,7 +5,7 @@
 #
 
 ifdef CROSS_TO_MSDOS
-BUILD_LUA=1
+BUILD_TARGET_LUA=1
 BUILD_PDCURSES=1
 CROSS_SHARED=1
 override TARGET = msdos
@@ -15,7 +15,7 @@ override TARGET_LIBS=
 endif
 
 ifdef CROSS_TO_AMIGA
-BUILD_LUA=1
+BUILD_TARGET_LUA=1
 BUILD_PDCURSES=1
 CROSS_SHARED=1
 override TARGET = amiga
@@ -25,14 +25,14 @@ override TARGET_LIBS=
 endif
 
 ifdef CROSS_TO_WASM
-BUILD_LUA=1
+BUILD_TARGET_LUA=1
 override TARGET = wasm
 override TARGETDIR=../targets/$(TARGET)
 override TARGETPFX = $(TARGETDIR)/
 override TARGET_LIBS= 
 endif
 
-ifdef BUILD_LUA
+ifdef BUILD_TARGET_LUA
 #===============-=================================================
 # LUA library
 # Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
@@ -65,7 +65,7 @@ BUILDMORE += $(LUACROSSLIB)
 override TARGET_LIBS += $(LUACROSSLIB) -lm
 else
 LUAINCL=
-endif  # BUILD_LUA
+endif  # BUILD_TARGET_LUA
 
 ifdef BUILD_PDCURSES
 #===============-=================================================
@@ -333,11 +333,11 @@ override TARGET_CFLAGS = $(EMCC_CFLAGS) -c \
 override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 override TARGET_LINK = $(TARGET_CC)
 override TARGET_LFLAGS= $(EMCC_LFLAGS)
-override SYSSRC = ../sys/unix/unixmain.c \
+override SYSSRC = ../sys/lib/libnethackmain.c \
                ../sys/share/ioctl.c ../sys/share/unixtty.c \
                ../sys/unix/unixunix.c ../sys/unix/unixres.c \
                ../win/shim/winshim.c
-override SYSOBJ= $(TARGETPFX)unixmain.o \
+override SYSOBJ= $(TARGETPFX)libnethackmain.o \
                $(TARGETPFX)ioctl.o $(TARGETPFX)unixtty.o \
                $(TARGETPFX)unixunix.o $(TARGETPFX)unixres.o \
                $(TARGETPFX)winshim.o
@@ -354,6 +354,9 @@ CLEANMORE += rm -f -r $(TARGETDIR)
 # Rule for file in sys/unix
 $(TARGETPFX)%.o : ../sys/unix/%.c
        $(TARGET_CC) $(TARGET_CFLAGS) -c -o$@ $<
+# Rule for file in sys/lib
+$(TARGETPFX)%.o : ../sys/lib/%.c
+       $(TARGET_CC) $(TARGET_CFLAGS) -c -o$@ $<
 # Rule for files in win/shim
 $(TARGETPFX)%.o : ../win/shim/%.c
        $(TARGET_CC) $(TARGET_CFLAGS) -c -o$@ $<
@@ -377,11 +380,11 @@ $(TARGETPFX)%.o : ../util/%.c
        $(TARGET_CC) $(TARGET_CFLAGS) -o$@ $<
 endif  # CROSS_SHARED
 
-ifdef BUILD_LUA
+ifdef BUILD_TARGET_LUA
 # Rule for LUA files
 $(TARGETPFX)%.o : $(LUATOP)/src/%.c
        $(TARGET_CC) $(TARGET_CFLAGS) $(LUA_FLAGS) -o$@ $<
-endif  # BUILD_LUA
+endif  # BUILD_TARGET_LUA
 #
 # End of cross-compiling -PRE section
 #===============-=================================================

diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020
index 751eae43da9680f2cd489eb6be60dcff3b4d1fe4..2780cbb77c265ad5c6e55f6c178a5a78dda1470a 100755 (executable)
--- a/sys/unix/hints/linux.2020
+++ b/sys/unix/hints/linux.2020
@@ -166,10 +166,15 @@ VARDATND += $(sort $(VARDATND0))
 
 ifdef WANT_LIBNH
 CFLAGS += -DSHIM_GRAPHICS -DNOTTYGRAPHICS -DNOSHELL -DLIBNH
-WINOBJ = winshim.o
+LIBNHSYSSRC = ../sys/lib/libnethackmain.c \
+               ../sys/share/ioctl.c ../sys/share/unixtty.c \
+               ../sys/unix/unixunix.c ../sys/unix/unixres.c \
+               ../win/shim/winshim.c
+LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
+                unixres.o winshim.o
 MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
-libnethack.a: $(HOBJ) $(SYSOBJ) $(WINOBJ) ../lib/lua/liblua.a
-       $(AR) rcs $@ $(HOBJ) $(WINOBJ) ../lib/lua/liblua.a
+libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
+       $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
        @echo "$@ built."
 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 fbd7724f2f5fb4ccd236953e2b04bcd8141a2420..7d20058325e4f88e70fbc84fc895461a10a50248 100755 (executable)
--- a/sys/unix/hints/macOS.2020
+++ b/sys/unix/hints/macOS.2020
@@ -173,10 +173,15 @@ VARDATND += $(sort $(VARDATND0))
 
 ifdef WANT_LIBNH
 CFLAGS += -DSHIM_GRAPHICS -DNOTTYGRAPHICS -DNOSHELL -DLIBNH
-WINOBJ = winshim.o
+LIBNHSYSSRC = ../sys/lib/libnethackmain.c \
+               ../sys/share/ioctl.c ../sys/share/unixtty.c \
+               ../sys/unix/unixunix.c ../sys/unix/unixres.c \
+               ../win/shim/winshim.c
+LIBNHSYSOBJ= libnethackmain.o ioctl.o unixtty.o unixunix.o \
+                unixres.o winshim.o
 MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
-libnethack.a: $(HOBJ) $(SYSOBJ) $(WINOBJ) ../lib/lua/liblua.a
-       $(AR) rcs $@ $(HOBJ) $(WINOBJ) ../lib/lua/liblua.a
+libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
+       $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
        @echo "$@ built."
 winshim.o : ../win/shim/winshim.c $(HACK_H)
        $(CC) $(CFLAGS) -c -o$@ $<