add new exports, cleaner debugging options

diff --git a/sys/lib/hints/wasm b/sys/lib/hints/wasm
index 7f85090aff686a6596aaf13d0b0670de53c0eefb..681c1e6939ed677687ea7407ffe92bb7c540b6a0 100644 (file)
--- a/sys/lib/hints/wasm
+++ b/sys/lib/hints/wasm
@@ -18,7 +18,7 @@ EMCC_LFLAGS+=-s ALLOW_TABLE_GROWTH
 EMCC_LFLAGS+=-s ASYNCIFY -s ASYNCIFY_IMPORTS='["local_callback"]'
 EMCC_LFLAGS+=-O3
 EMCC_LFLAGS+=-s MODULARIZE
-EMCC_LFLAGS+=-s EXPORTED_FUNCTIONS='["_main", "_shim_graphics_set_callback"]'
+EMCC_LFLAGS+=-s EXPORTED_FUNCTIONS='["_main", "_shim_graphics_set_callback", "_mapglyph", "_display_inventory"]'
 EMCC_LFLAGS+=-s EXPORTED_RUNTIME_METHODS='["cwrap", "ccall", "addFunction", "removeFunction", "UTF8ToString", "getValue", "setValue"]'
 EMCC_LFLAGS+=-s ERROR_ON_UNDEFINED_SYMBOLS=0
 EMCC_LFLAGS+=--embed-file wasm-data@/
@@ -31,22 +31,35 @@ EMCC_CFLAGS=
 EMCC_CFLAGS+=-Wall
 EMCC_CFLAGS+=-Werror
 #EMCC_CFLAGS+=-s DISABLE_EXCEPTION_CATCHING=0
-EMCC_DEBUG_CFLAGS+=-s ASSERTIONS=1
-#EMCC_DEBUG_CFLAGS+=-s ASSERTIONS=2
+#EMCC_CFLAGS+=-s NO_EXIT_RUNTIME=1
+EMCC_CFLAGS+=-s EXIT_RUNTIME=1
+# if INVOKE_RUN=0, you must Module.callMain() with an optional parameter of commandline args
+#EMCC_CFLAGS+=-s INVOKE_RUN=0
+
+#EMCC_DEBUG_CFLAGS+=-s ASSERTIONS=1
+EMCC_DEBUG_CFLAGS+=-s ASSERTIONS=2
 EMCC_DEBUG_CFLAGS+=-s STACK_OVERFLOW_CHECK=2
 EMCC_DEBUG_CFLAGS+=-s SAFE_HEAP=1
 EMCC_DEBUG_CFLAGS+=-s LLD_REPORT_UNDEFINED=1
-#EMCC_DEBUG_CFLAGS+=-s EXCEPTION_DEBUG=1
+EMCC_DEBUG_CFLAGS+=-s EXCEPTION_DEBUG=0
 #EMCC_DEBUG_CFLAGS+=-fsanitize=undefined -fsanitize=address -fsanitize=leak
-#EMCC_DEBUG_CFLAGS+=-s EXIT_RUNTIME
+EMCC_DEBUG_CFLAGS+=--profiling
+
 EMCC_PROD_CFLAGS+=-O3
 
+ifdef WASM_DEBUG
+EMCC_CFLAGS+=$(EMCC_DEBUG_CFLAGS)
+else
+EMCC_CFLAGS+=$(EMCC_PROD_CFLAGS)
+endif
+
 # Nethack C flags
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"/sysconf\" -DSECURE
 CFLAGS+=-g -I../include -DNOTPARMDECL
 CFLAGS+=-Wall
 CFLAGS+=-Werror
 CFLAGS+=-DGCC_WARN
+CFLAGS+=-DNO_SIGNAL
 
 # NetHack sources control
 CFLAGS+=-DDLB
@@ -55,12 +68,6 @@ CFLAGS+=-DDLB
 #CFLAGS+=-DGREPPATH=\"/usr/bin/grep\"
 CFLAGS+=-DNOMAIL
 
-ifdef WASM_DEBUG
-EMCC_CFLAGS+=$(EMCC_DEBUG_CFLAGS)
-else
-EMCC_CFLAGS+=$(EMCC_PROD_CFLAGS)
-endif
-
 # installation config
 # hackdir is the wasm / emscripten embed data root directory
 HACKDIR=/
@@ -74,4 +81,4 @@ INSTDIR=$(HACKDIR)
 VARDIR=$(HACKDIR)
 
 #-POST
-# no post
\ No newline at end of file
+# no post