get this working: "make wasm"

This commit is contained in:
nhmall
2020-10-11 10:51:46 -04:00
parent d4e97cc650
commit 0adb64e384
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -209,7 +209,7 @@ dlb:
( cd dat ; LC_ALL=C ; ../util/dlb cf nhdat $(DATDLB) ) ( cd dat ; LC_ALL=C ; ../util/dlb cf nhdat $(DATDLB) )
wasm: wasm:
( cd src ; $(MAKE) $(WASM_TARGET) ) ( cd src ; $(MAKE) CROSS_TO_WASM=1 ../targets/wasm/nethack.js )
package: $(GAME) recover $(VARDAT) spec_levs package: $(GAME) recover $(VARDAT) spec_levs
( cd src ; $(MAKE) $(PACKAGE) ) ( cd src ; $(MAKE) $(PACKAGE) )
+1 -2
View File
@@ -133,8 +133,7 @@ $(WASM_DATA_DIR): $(WASM_DATA_DIR)/nhdat
cp ../sys/lib/sysconf $(WASM_DATA_DIR)/sysconf cp ../sys/lib/sysconf $(WASM_DATA_DIR)/sysconf
$(WASM_DATA_DIR)/nhdat: $(WASM_DATA_DIR)/nhdat:
( cd ..; $(MAKE) INSTDIR='$(WASM_DATA_DIR)' dlb ) ( cd ..; $(MAKE) INSTDIR='$(WASM_DATA_DIR)' $(WASMDEP) dofiles-dlb )
( cd ..; $(MAKE) INSTDIR='$(WASM_DATA_DIR)' dofiles-dlb )
# #
$(TARGETPFX)unixmain.o : ../sys/unix/unixmain.c $(HACK_H) $(TARGETPFX)unixmain.o : ../sys/unix/unixmain.c $(HACK_H)
+2 -1
View File
@@ -384,7 +384,8 @@ override WINOBJ=
override GAME= override GAME=
# the real VARDAT hasn't been defined yet for use in ALLDEP override # the real VARDAT hasn't been defined yet for use in ALLDEP override
WASM_DAT = bogusmon data engrave epitaph oracles options quest.lua rumors WASM_DAT = bogusmon data engrave epitaph oracles options quest.lua rumors
override ALLDEP = include/nhlua.h $(WASM_DAT) spec_levs check-dlb wasm WASMDEP = include/nhlua.h $(WASM_DAT) spec_levs check-dlb
override ALLDEP = $(WASMDEP) wasm
override PREGAME += mkdir -p $(TARGETDIR)/wasm-data ; override PREGAME += mkdir -p $(TARGETDIR)/wasm-data ;
override CLEANMORE += rm -rf $(TARGETDIR) ; override CLEANMORE += rm -rf $(TARGETDIR) ;
RANLIB=$(EMRANLIB) RANLIB=$(EMRANLIB)