From 2d27a8c3e2af71df3f2254f5057942887b2d35a3 Mon Sep 17 00:00:00 2001 From: Toad King Date: Sun, 14 Jan 2018 02:53:34 -0600 Subject: [PATCH] fix exiting not terminating emscripten runtime --- Makefile.emscripten | 2 +- frontend/drivers/platform_emscripten.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.emscripten b/Makefile.emscripten index 6a8a39e036..2fb4de0e2d 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -39,7 +39,7 @@ endif #if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS: LIBS := -s USE_SDL=2 -s USE_ZLIB=1 -LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) \ +LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 \ -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \ --js-library emscripten/library_rwebaudio.js \ --js-library emscripten/library_rwebcam.js diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c index 38215d8321..838f3e365e 100644 --- a/frontend/drivers/platform_emscripten.c +++ b/frontend/drivers/platform_emscripten.c @@ -57,7 +57,7 @@ static void emscripten_mainloop(void) return; main_exit(NULL); - exit(0); + emscripten_force_exit(0); } void cmd_savefiles(void)