mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-09-04 08:33:55 +02:00
Intubun
8e8fada32f
The pieces that make Magic actually buildable as a WASM library.
* magic/magicWasm.c — new headless entry point exporting four
functions used by the JS wrapper:
- magic_wasm_init() idempotent initialisation
- magic_wasm_run_command(s) dispatch one Magic command
- magic_wasm_source_file(p) execute a script from the VFS
- magic_wasm_update() drive a display-update cycle
Sets CAD_ROOT=/ if unset, so embedded technology files under
/magic/sys/ resolve correctly. Centers the command point inside
GrScreenRect so commands route to the layout window client
rather than the border/window-management client.
* utils/main.c, utils/main.h — split magicMain() into magicMainInit()
+ the dispatch loop. magicMainInit is idempotent (a static flag
guards against re-initialisation) so JS callers can call any of
the four wasm entry points first without sequencing.
* magic/Makefile — adds the WASM link target, gated by MAKE_WASM=1
set from toolchains/emscripten/defs.mak. Conditionally compiles
magicWasm.c into the main binary, links to magic.js and runs
post-build.sh on the result.
* toolchains/emscripten/defs.mak — Emscripten linker flags (WASM=1,
MODULARIZE, EXPORT_ES6, ALLOW_MEMORY_GROWTH, INITIAL_MEMORY=32M,
STACK_SIZE=5M), the four EXPORTED_FUNCTIONS, and the embed-file
bindings for the technology files under /magic/sys/.
* toolchains/emscripten/post-build.sh — patches Emscripten's ESM
output so it works in pure Node.js ESM: aliases require()
through createRequire, injects __filename / __dirname shims,
and resyncs the ___emscripten_embedded_file_data constant from
the wasm global section if Emscripten emitted a stale value.
Idempotent and pinned to emsdk 3.1.56 (see WARNING in the
header).
* toolchains/emscripten/README.md — full build documentation:
quick-start via npm/build.sh, manual build, list of embedded
files, exported C API, JavaScript usage example, and notes on
CAD_ROOT, DISPLAY_SUSPEND, and the signal-API stubs.
* .gitignore — adds the WASM artefacts (magic.js, magic.wasm,
magic.symbols), tightens the editor/OS cruft list, and keeps
toolchains/emscripten/defs.mak tracked despite the `defs.mak`
ignore rule.
38 lines
1.5 KiB
Makefile
38 lines
1.5 KiB
Makefile
# WASM-specific make additions — append to the configure-generated defs.mak.
|
|
#
|
|
# Usage (matches what the CI workflow does):
|
|
#
|
|
# source <emsdk>/emsdk_env.sh
|
|
# CFLAGS="--std=c17 -D_DEFAULT_SOURCE=1 -DEMSCRIPTEN=1 -g" \
|
|
# emconfigure ./configure --without-cairo --without-opengl --without-x \
|
|
# --without-tk --without-tcl \
|
|
# --disable-readline --disable-compression \
|
|
# --target=asmjs-unknown-emscripten
|
|
# cat toolchains/emscripten/defs.mak >> defs.mak
|
|
# emmake make depend
|
|
# emmake make -j$(nproc) modules libs
|
|
# emmake make techs
|
|
# emmake make mains
|
|
|
|
# Activate the WASM link target in magic/Makefile.
|
|
MAKE_WASM = 1
|
|
|
|
# Emscripten linker flags.
|
|
# The link step runs from the magic/ subdirectory, so embed-file paths
|
|
# are relative to that directory (../scmos, ../windows/...).
|
|
TOP_EXTRA_LIBS += \
|
|
-sWASM=1 \
|
|
-sMODULARIZE=1 \
|
|
-sEXPORT_ES6=1 \
|
|
-sEXPORTED_FUNCTIONS=_magic_wasm_init,_magic_wasm_run_command,_magic_wasm_source_file,_magic_wasm_update \
|
|
-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,FS,setValue,getValue \
|
|
-sALLOW_MEMORY_GROWTH=1 \
|
|
-sINITIAL_MEMORY=33554432 \
|
|
-sSTACK_SIZE=5242880 \
|
|
-sASSERTIONS=1 \
|
|
-sENVIRONMENT=node,web,worker \
|
|
-sFORCE_FILESYSTEM=1 \
|
|
--embed-file ../scmos@/magic/sys/current \
|
|
--embed-file ../windows/windows7.glyphs@/magic/sys/windows7.glyphs \
|
|
--embed-file ../windows/windows7.glyphs@/magic/sys/bw.glyphs
|