Update emscripten and assimp.

kovacsv · Dec 29, 2022 · b88010a · b88010a
1 parent 5607018
commit b88010a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,6 +62,7 @@ if (${EMSCRIPTEN})
 
 	target_link_options (AssimpJS PUBLIC -sMODULARIZE=1)
 	target_link_options (AssimpJS PUBLIC -sEXPORT_NAME='assimpjs')
+	target_link_options (AssimpJS PUBLIC -sSTACK_SIZE=10MB)
 	target_link_options (AssimpJS PUBLIC -sALLOW_MEMORY_GROWTH=1 --no-heap-copy)
 	target_link_options (AssimpJS PUBLIC -sNO_DISABLE_EXCEPTION_CATCHING)
 

diff --git a/assimp b/assimp
diff --git a/dist/assimpjs.js b/dist/assimpjs.js
diff --git a/dist/assimpjs.wasm b/dist/assimpjs.wasm
diff --git a/docs/dist/assimpjs.js b/docs/dist/assimpjs.js
diff --git a/docs/dist/assimpjs.wasm b/docs/dist/assimpjs.wasm
diff --git a/tools/setup_emscripten_win.bat b/tools/setup_emscripten_win.bat
@@ -2,10 +2,10 @@ pushd %~dp0\..
 
 call git clone https://github.com/emscripten-core/emsdk.git
 call cd emsdk
-call emsdk install 3.1.14
-call emsdk activate 3.1.14
-call emsdk install mingw-4.6.2-32bit
-call emsdk activate mingw-4.6.2-32bit
+call emsdk install 3.1.28
+call emsdk activate 3.1.28
+call emsdk install mingw-7.1.0-64bit
+call emsdk activate mingw-7.1.0-64bit
 call cd ..
 
 popd