Skip to content

Commit 7088f4d

Browse files
committed
Increased minimum emscripten version to 3.1.25, maximum version to 3.2.0
1 parent fbb6de2 commit 7088f4d

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
required: false
1111

1212
env:
13-
EM_VERSION: 3.1.14
13+
EM_VERSION: 3.1.25
1414
EM_CACHE_FOLDER: 'emsdk-cache'
1515
BUILD_TYPE: Release
1616

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ if (EMSCRIPTEN)
1919
OR using 'emcmake cmake ..' to build")
2020
endif ()
2121

22-
set(MIN_VERSION "3.1.14")
23-
set(MAX_VERSION "3.1.25")
22+
set(MIN_VERSION "3.1.25")
23+
set(MAX_VERSION "3.2.0")
2424
if (${EMSCRIPTEN_VERSION} VERSION_LESS MIN_VERSION)
2525
message(FATAL_ERROR "EMSCRIPTEN version looks too old. Was ${EMSCRIPTEN_VERSION}, should be at least ${MIN_VERSION}.")
2626
endif ()
27-
if (${EMSCRIPTEN_VERSION} VERSION_GREATER MAX_VERSION)
27+
if (${EMSCRIPTEN_VERSION} VERSION_GREATER_EQUAL MAX_VERSION)
2828
message(FATAL_ERROR "EMSCRIPTEN version is too new. Was ${EMSCRIPTEN_VERSION}, should be at least ${MAX_VERSION}.")
2929
endif ()
3030

@@ -89,7 +89,7 @@ if (EMSCRIPTEN)
8989
"SHELL:-s NO_DISABLE_EXCEPTION_CATCHING"
9090
"SHELL:-s INITIAL_MEMORY=256MB"
9191
"SHELL:-s DEFAULT_PTHREAD_STACK_SIZE=64KB"
92-
"SHELL:-s STACK_SIZE=64KB" # TODO: Once the minimum version of em++ > 3.1.25, please change this to TOTAL_STACK
92+
"SHELL:-s TOTAL_SIZE=64KB"
9393
"SHELL:-s WASM=1"
9494
"SHELL:-s ALLOW_MEMORY_GROWTH"
9595
"SHELL:-s FORCE_FILESYSTEM=1"

0 commit comments

Comments
 (0)