nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

integrate updates made to PR earlier on Oct 4

Browse Source
This commit is contained in:
nhmall
2020-10-04 20:05:29 -04:00
parent 751d5ef76c
commit 15c1cb648d
4 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys/unix/hints/include/cross-post.2020
View File

@@ -161,7 +161,7 @@ $(TARGETPFX)recover.exe : $(TARGETPFX)recover.o
$(TARGET_LINK) $(TARGET_LFLAGS) $(TARGETPFX)recover.o -o $@ $(TARGET_LINK) $(TARGET_LFLAGS) $(TARGETPFX)recover.o -o $@
endif # CROSS_SHARED endif # CROSS_SHARED
# #
ifdef BUILD_LUA ifdef BUILD_TARGET_LUA
# Lua lib # Lua lib
$(LUACROSSLIB): $(LUALIBOBJS) $(LUACROSSLIB): $(LUALIBOBJS)
if [ -f $@ ]; then rm $@; fi; if [ -f $@ ]; then rm $@; fi;
@@ -206,7 +206,7 @@ $(TARGETPFX)lundump.o : $(LUATOP)/src/lundump.c
$(TARGETPFX)lutf8lib.o : $(LUATOP)/src/lutf8lib.c $(TARGETPFX)lutf8lib.o : $(LUATOP)/src/lutf8lib.c
$(TARGETPFX)lvm.o : $(LUATOP)/src/lvm.c $(TARGETPFX)lvm.o : $(LUATOP)/src/lvm.c
$(TARGETPFX)lzio.o : $(LUATOP)/src/lzio.c $(TARGETPFX)lzio.o : $(LUATOP)/src/lzio.c
endif # BUILD_LUA endif # BUILD_TARGET_LUA
ifdef BUILD_PDCURSES ifdef BUILD_PDCURSES
ifdef WANT_WIN_CURSES ifdef WANT_WIN_CURSES

21
sys/unix/hints/include/cross-pre.2020
View File

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

11
sys/unix/hints/linux.2020
View File

@@ -166,10 +166,15 @@ VARDATND += $(sort $(VARDATND0))
ifdef WANT_LIBNH ifdef WANT_LIBNH
CFLAGS += -DSHIM_GRAPHICS -DNOTTYGRAPHICS -DNOSHELL -DLIBNH 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 ) MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
libnethack.a: $(HOBJ) $(SYSOBJ) $(WINOBJ) ../lib/lua/liblua.a libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
$(AR) rcs $@ $(HOBJ) $(WINOBJ) ../lib/lua/liblua.a $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
@echo "$@ built." @echo "$@ built."
winshim.o : ../win/shim/winshim.c $(HACK_H) winshim.o : ../win/shim/winshim.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $< $(CC) $(CFLAGS) -c -o$@ $<

11
sys/unix/hints/macOS.2020
View File

@@ -173,10 +173,15 @@ VARDATND += $(sort $(VARDATND0))
ifdef WANT_LIBNH ifdef WANT_LIBNH
CFLAGS += -DSHIM_GRAPHICS -DNOTTYGRAPHICS -DNOSHELL -DLIBNH 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 ) MOREALL += ( cd src ; $(MAKE) pregame ; $(MAKE) libnethack.a )
libnethack.a: $(HOBJ) $(SYSOBJ) $(WINOBJ) ../lib/lua/liblua.a libnethack.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
$(AR) rcs $@ $(HOBJ) $(WINOBJ) ../lib/lua/liblua.a $(AR) rcs $@ $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a
@echo "$@ built." @echo "$@ built."
winshim.o : ../win/shim/winshim.c $(HACK_H) winshim.o : ../win/shim/winshim.c $(HACK_H)
$(CC) $(CFLAGS) -c -o$@ $< $(CC) $(CFLAGS) -c -o$@ $<