diff --git a/Makefile.emscripten b/Makefile.emscripten index c022370..057ca03 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -4,9 +4,6 @@ OBJS := $(SYSOBJS) $(EMOBJS) DEPS := $(OBJS:%.o=%.d) -# Whitelist generated by -s EMTERPRETIFY_ADVISE=1 -EMTERPRETIFY_WHITELIST := -s EMTERPRETIFY_WHITELIST='["__ZN4NACT12cmd_open_objEi", "__ZN4NACT13cmd_open_menuEv", "__ZN4NACT13cmd_open_verbEv", "__ZN4NACT5cmd_aEv", "__ZN4NACT5cmd_kEv", "__ZN4NACT5cmd_rEv", "__ZN4NACT5cmd_yEv", "__ZN4NACT7executeEv", "__ZN4NACT8mainloopEv", "_main"]' - INCLUDES := -Isrc -Isrc/sys DEFS := -D_SYSTEM3 # DEFS += -D_DEBUG_CONSOLE @@ -17,7 +14,7 @@ EMFLAGS := $(EMPORTS) #EMFLAGS += -O1 -s SAFE_HEAP=1 EMFLAGS += -O2 -EMFLAGS += -s EMTERPRETIFY=1 -s EMTERPRETIFY_ASYNC=1 $(EMTERPRETIFY_WHITELIST) +EMFLAGS += -s EMTERPRETIFY=1 -s EMTERPRETIFY_ASYNC=1 WASMFLAGS := -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s "BINARYEN_TRAP_MODE='allow'" ASMJSFLAGS := -s TOTAL_MEMORY=33554432 @@ -31,14 +28,17 @@ LFLAGS += -s EXPORTED_FUNCTIONS="['_main','_ags_setAntialiasedStringMode']" all: doc/system3.js doc/system3.asm.js -doc/system3.js: system3.bc - $(CXX) $< $(LFLAGS) $(WASMFLAGS) $(LIBS) -o $@ +doc/system3.js: system3.bc emterpretify_whitelist + $(CXX) $< $(LFLAGS) $(WASMFLAGS) $(LIBS) @emterpretify_whitelist -o $@ -doc/system3.asm.js: system3.bc - $(CXX) $< $(LFLAGS) $(ASMJSFLAGS) $(LIBS) -o $@ +doc/system3.asm.js: system3.bc emterpretify_whitelist + $(CXX) $< $(LFLAGS) $(ASMJSFLAGS) $(LIBS) @emterpretify_whitelist -o $@ system3.bc: $(OBJS) $(CXX) $(OBJS) $(LFLAGS) $(LIBS) -o $@ +emterpretify_whitelist: + $(CXX) $(EMPORTS) -s EMTERPRETIFY=1 -s EMTERPRETIFY_ADVISE=1 system3.bc |grep EMTERPRETIFY_WHITELIST > $@ + clean: rm -f $(OBJS) $(DEPS) system3.js system3.bc $(DEPS)