44# cmake --build build
55# emrun bin/em/<app>
66#
7- # Project options (cache variables):
8- # OF_EMSCRIPTEN_INITIAL_MEMORY bytes (default 128 MB)
9- # OF_EMSCRIPTEN_EMBIND_AOT ON (default) / OFF
10- # OF_EMSCRIPTEN_TEMPLATE HTML shell file (default the one in project/emscripten)
11- # OF_WEBGL_VERSION 2 (default) or 1
12- # OF_EMSCRIPTEN_MEMORY64 OFF (default) / ON: wasm64, libs from lib/emscripten/WASM64
7+ # Project options (cache variables, same names as the makefiles' config.make options):
8+ # PROJECT_EMSCRIPTEN_WASM 32 (default) or 64: wasm64 (MEMORY64), libs from
9+ # lib/emscripten/WASM64, core in lib/emscripten/WASM64
10+ # PROJECT_EMSCRIPTEN_TOTAL_MEMORY initial memory in bytes (default 128 MB)
11+ # PROJECT_EMSCRIPTEN_EMBIND_AOT ON (default) / OFF
12+ # PROJECT_EMSCRIPTEN_TEMPLATE HTML shell file (default the one in project/emscripten)
13+ # OF_WEBGL_VERSION 2 (default) or 1
1314
1415include_guard (GLOBAL )
1516
16- set (OF_EMSCRIPTEN_INITIAL_MEMORY 134217728 CACHE STRING "Initial wasm memory in bytes" )
17- option (OF_EMSCRIPTEN_EMBIND_AOT "Ahead-of-time embind (CSP safe)" ON )
18- set (OF_EMSCRIPTEN_TEMPLATE "${OF_LIBS_DIR} /openFrameworksCompiled/project/emscripten/template.html"
17+ if (EMSCRIPTEN_MEMORY64)
18+ set (_of_wasm_default 64)
19+ else ()
20+ set (_of_wasm_default 32)
21+ endif ()
22+ set (PROJECT_EMSCRIPTEN_WASM ${_of_wasm_default} CACHE STRING "WebAssembly 32 or 64 (MEMORY64)" )
23+ set_property (CACHE PROJECT_EMSCRIPTEN_WASM PROPERTY STRINGS 32 64)
24+ if (NOT PROJECT_EMSCRIPTEN_WASM MATCHES "^(32|64)$" )
25+ message (FATAL_ERROR "PROJECT_EMSCRIPTEN_WASM must be 32 or 64, not \" ${PROJECT_EMSCRIPTEN_WASM} \" " )
26+ endif ()
27+ set (PROJECT_EMSCRIPTEN_TOTAL_MEMORY 134217728 CACHE STRING "Initial wasm memory in bytes" )
28+ option (PROJECT_EMSCRIPTEN_EMBIND_AOT "Ahead-of-time embind (CSP safe)" ON )
29+ set (PROJECT_EMSCRIPTEN_TEMPLATE "${OF_LIBS_DIR} /openFrameworksCompiled/project/emscripten/template.html"
1930 CACHE FILEPATH "HTML shell for the app" )
2031set (OF_WEBGL_VERSION 2 CACHE STRING "WebGL version (1 or 2)" )
21- option (OF_EMSCRIPTEN_MEMORY64 "64-bit wasm memory (MEMORY64)" OFF )
32+
33+ # wasm64: the core goes in lib/emscripten/WASM64, like the makefiles
34+ if (PROJECT_EMSCRIPTEN_WASM STREQUAL "64" )
35+ set (OF_ARCH WASM64)
36+ endif ()
2237
2338set (OF_PLATFORM_SOURCE_EXTENSIONS cpp cc cxx c)
2439
@@ -70,23 +85,23 @@ set(OF_PLATFORM_LINK_OPTIONS
7085 -sUSE_GLFW=3
7186 -sEXPORTED_RUNTIME_METHODS=ccall,cwrap,FS,UTF8ToString,stringToUTF8,lengthBytesUTF8
7287 -sERROR_ON_UNDEFINED_SYMBOLS=1
73- -sINITIAL_MEMORY=${OF_EMSCRIPTEN_INITIAL_MEMORY }
88+ -sINITIAL_MEMORY=${PROJECT_EMSCRIPTEN_TOTAL_MEMORY }
7489 -sALLOW_MEMORY_GROWTH=1
7590 -sWASM=1
76- "SHELL:--shell-file ${OF_EMSCRIPTEN_TEMPLATE } "
91+ "SHELL:--shell-file ${PROJECT_EMSCRIPTEN_TEMPLATE } "
7792 "$<$<CONFIG :Debug >:-sVERBOSE =1;-sGL_ASSERTIONS =1;-sASSERTIONS =2;-gsource -map >" )
7893if (OF_WEBGL_VERSION STREQUAL "1" )
7994 list (APPEND OF_PLATFORM_LINK_OPTIONS -sMAX_WEBGL_VERSION=1 -sFULL_ES2)
8095else ()
8196 list (APPEND OF_PLATFORM_LINK_OPTIONS -sMAX_WEBGL_VERSION=2 -sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION=1 -sFULL_ES3)
8297endif ()
83- if (OF_EMSCRIPTEN_EMBIND_AOT )
98+ if (PROJECT_EMSCRIPTEN_EMBIND_AOT )
8499 list (APPEND OF_PLATFORM_LINK_OPTIONS -sEMBIND_AOT=1 -sDYNAMIC_EXECUTION=0)
85100else ()
86101 list (APPEND OF_PLATFORM_LINK_OPTIONS -sDYNAMIC_EXECUTION=1)
87102endif ()
88103
89- if (OF_EMSCRIPTEN_MEMORY64 )
104+ if (PROJECT_EMSCRIPTEN_WASM STREQUAL "64" )
90105 list (APPEND OF_PLATFORM_COMPILE_OPTIONS -sMEMORY64=1)
91106 list (APPEND OF_PLATFORM_LINK_OPTIONS -sMEMORY64=1 -mwasm64)
92107endif ()
@@ -111,9 +126,9 @@ set(OF_CORE_LIB_NAME openFrameworks)
111126set (OF_CORE_LIB_NAME_DEBUG openFrameworksDebug)
112127set (OF_CORE_LIB_SUFFIX .a)
113128
114- # libs/<name>/lib/emscripten/WASM (WASM64 with OF_EMSCRIPTEN_MEMORY64 )
129+ # libs/<name>/lib/emscripten/WASM (WASM64 with PROJECT_EMSCRIPTEN_WASM=64 )
115130function (of_platform_lib_dirs lib_folder out_var )
116- if (OF_EMSCRIPTEN_MEMORY64 )
131+ if (PROJECT_EMSCRIPTEN_WASM STREQUAL "64" )
117132 set (${out_var} "${lib_folder} " "${lib_folder} /WASM64" PARENT_SCOPE )
118133 else ()
119134 set (${out_var} "${lib_folder} " "${lib_folder} /WASM" PARENT_SCOPE )
0 commit comments