Skip to content

Commit 71daeb7

Browse files
committed
CMake Emscripten: use the makefiles' option names
PROJECT_EMSCRIPTEN_WASM (32 / 64), PROJECT_EMSCRIPTEN_TOTAL_MEMORY, PROJECT_EMSCRIPTEN_EMBIND_AOT and PROJECT_EMSCRIPTEN_TEMPLATE, as in a project's config.make, so the Project Generator writes the same setting for both. wasm64 builds the core into lib/emscripten/WASM64 like the makefiles; EMSCRIPTEN_MEMORY64 still selects 64.
1 parent 7a295d2 commit 71daeb7

2 files changed

Lines changed: 38 additions & 20 deletions

File tree

‎libs/openFrameworksCompiled/project/CMake/README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,18 @@ cmake --build build/core
6363

6464
## Options
6565

66+
The Emscripten `PROJECT_EMSCRIPTEN_*` options have the same names and values as the
67+
makefiles' `config.make` options.
68+
6669
| Option | Default | |
6770
|---|---|---|
6871
| `OF_BUILD_CORE` | `OFF` | build the core in this build even if a prebuilt one exists |
6972
| `OF_PLATFORM` | detected | `macos ios tvos emscripten linux64 linuxaarch64 linuxarmv7l linuxarmv6l vs msys2` |
7073
| `OF_USE_DAWN`, `OF_USE_ANGLE` | `OFF` | link `libs/dawn`, `libs/metalangle` |
71-
| `OF_EMSCRIPTEN_INITIAL_MEMORY` | `134217728` | |
72-
| `OF_EMSCRIPTEN_EMBIND_AOT` | `ON` | |
73-
| `OF_EMSCRIPTEN_TEMPLATE` | `project/emscripten/template.html` | HTML shell |
74-
| `OF_EMSCRIPTEN_MEMORY64` | `OFF` | wasm64, libs from `lib/emscripten/WASM64` |
74+
| `PROJECT_EMSCRIPTEN_WASM` | `32` | `64` for wasm64 (MEMORY64): libs from `lib/emscripten/WASM64`, core in `lib/emscripten/WASM64` |
75+
| `PROJECT_EMSCRIPTEN_TOTAL_MEMORY` | `134217728` | initial memory in bytes |
76+
| `PROJECT_EMSCRIPTEN_EMBIND_AOT` | `ON` | |
77+
| `PROJECT_EMSCRIPTEN_TEMPLATE` | `project/emscripten/template.html` | HTML shell |
7578
| `OF_WEBGL_VERSION` | `2` | `1` for a WebGL 1 build |
7679
| `OF_APPLE_DEVELOPMENT_TEAM` | | signing team for iOS / tvOS devices |
7780

‎libs/openFrameworksCompiled/project/CMake/platform/emscripten.cmake‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,36 @@
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

1415
include_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")
2031
set(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

2338
set(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>")
7893
if(OF_WEBGL_VERSION STREQUAL "1")
7994
list(APPEND OF_PLATFORM_LINK_OPTIONS -sMAX_WEBGL_VERSION=1 -sFULL_ES2)
8095
else()
8196
list(APPEND OF_PLATFORM_LINK_OPTIONS -sMAX_WEBGL_VERSION=2 -sWEBGL2_BACKWARDS_COMPATIBILITY_EMULATION=1 -sFULL_ES3)
8297
endif()
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)
85100
else()
86101
list(APPEND OF_PLATFORM_LINK_OPTIONS -sDYNAMIC_EXECUTION=1)
87102
endif()
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)
92107
endif()
@@ -111,9 +126,9 @@ set(OF_CORE_LIB_NAME openFrameworks)
111126
set(OF_CORE_LIB_NAME_DEBUG openFrameworksDebug)
112127
set(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)
115130
function(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

Comments
 (0)