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

adopt some integration suggestions

Browse Source 
sys/lib -> sys/libnh
sys/lib/libnethackmain.c -> sys/libnh/libnhmain.c
libnethack.a -> libnh.a
This commit is contained in:
nhmall
2020-10-11 13:33:51 -04:00
parent 0adb64e384
commit 6806c30a59
17 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ $(WASM_DATA_DIR): $(WASM_DATA_DIR)/nhdat
touch $(WASM_DATA_DIR)/record
touch $(WASM_DATA_DIR)/logfile
touch $(WASM_DATA_DIR)/xlogfile
cp ../sys/lib/sysconf $(WASM_DATA_DIR)/sysconf
cp ../sys/libnh/sysconf $(WASM_DATA_DIR)/sysconf
$(WASM_DATA_DIR)/nhdat:
( cd ..; $(MAKE) INSTDIR='$(WASM_DATA_DIR)' $(WASMDEP) dofiles-dlb )
@@ -142,7 +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)libnethackmain.o : ../sys/lib/libnethackmain.c \
$(TARGETPFX)libnhmain.o : ../sys/libnh/libnhmain.c \
$(HACK_H) ../include/date.h
endif # CROSS_TO_WASM
#

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

@@ -367,11 +367,11 @@ override TARGET_CFLAGS = $(EMCC_CFLAGS) $(WASM_CFLAGS) $(WASM_TARGET_CFLAGS)
override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
override TARGET_LINK = $(TARGET_CC)
override TARGET_LFLAGS= $(EMCC_LFLAGS)
override SYSSRC = ../sys/lib/libnethackmain.c \
override SYSSRC = ../sys/libnh/libnhmain.c \
../sys/share/ioctl.c ../sys/share/unixtty.c \
../sys/unix/unixunix.c ../sys/unix/unixres.c \
../win/shim/winshim.c
override SYSOBJ= $(TARGETPFX)libnethackmain.o \
override SYSOBJ= $(TARGETPFX)libnhmain.o \
$(TARGETPFX)ioctl.o $(TARGETPFX)unixtty.o \
$(TARGETPFX)unixunix.o $(TARGETPFX)unixres.o \
$(TARGETPFX)winshim.o
@@ -393,8 +393,8 @@ RANLIB=$(EMRANLIB)
# 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
# Rule for file in sys/libnh
$(TARGETPFX)%.o : ../sys/libnh/%.c
$(TARGET_CC) $(TARGET_CFLAGS) -c -o$@ $<
# Rule for files in win/shim
$(TARGETPFX)%.o : ../win/shim/%.c