From 8f48093409f550ef5d1a52c0d8492f9b3e344275 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Wed, 14 Jul 2021 18:29:50 +0900
Subject: [PATCH] Update emscripten to 2.0.25

---
 .github/workflows/emscripten.yml | 4 ++--
 src/CMakeLists.txt               | 6 +++---
 src/sys/nact.cpp                 | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index e1b7ab5..c70b077 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -2,7 +2,7 @@ name: Emscripten Build
 on: [push, pull_request]
 
 env:
-  emscripten-version: 2.0.15
+  emscripten-version: 2.0.25
 
 jobs:
   build:
@@ -20,7 +20,7 @@ jobs:
         key: emscripten-cache-${{ env.emscripten-version }}
 
     - name: Setup Emscripten toolchain
-      uses: mymindstorm/setup-emsdk@v7
+      uses: mymindstorm/setup-emsdk@v10
       with:
         version: ${{ env.emscripten-version }}
         actions-cache-folder: emsdk-cache
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f2fa4a..195ef95 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,11 +39,11 @@ elseif (EMSCRIPTEN)
   target_link_options(system3 PRIVATE
     "SHELL:-s ENVIRONMENT=web"
     "SHELL:-s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1"
-    "SHELL:-s ASYNCIFY_REMOVE=\"['SDL_Delay']\""
+    "SHELL:-s ASYNCIFY_REMOVE=SDL_Delay"
     "SHELL:-s ALLOW_MEMORY_GROWTH=1"
     "SHELL:-s NO_EXIT_RUNTIME=1"
-    "SHELL:-s ASYNCIFY_ADD=\"['NACT::execute()']\""
-    "SHELL:-s EXTRA_EXPORTED_RUNTIME_METHODS=\"['getValue','addRunDependency','removeRunDependency']\"")
+    "SHELL:-s ASYNCIFY_ADD=NACT::execute()"
+    "SHELL:-s EXPORTED_RUNTIME_METHODS=getValue,addRunDependency,removeRunDependency")
 
 else()  # NOT (ANDROID OR EMSCRIPTEN)
   add_executable(system3)
diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp
index 06d809d..138c7d3 100644
--- a/src/sys/nact.cpp
+++ b/src/sys/nact.cpp
@@ -132,6 +132,7 @@ bool NACT::mainloop()
 
 // コマンドパーサ
 
+EMSCRIPTEN_KEEPALIVE  // Prevent inlining, because this function is listed in ASYNCIFY_ADD
 void NACT::execute()
 {
 	// アドレスの確認