luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: WASM --embed-file paths per source/build tree (out-of-tree) 

The Emscripten link embedded data files via magic-relative paths
(../scmos, ../windows/...), which only resolve when the build dir is the
source dir.  Split them by which tree the data lives in:

* generated scmos tech files -> ${MAGICDIR}/scmos (the build tree, where
  `make techs` writes them);
* verbatim window glyphs      -> ${MAGICSRC}/windows/... (the source tree).

Out-of-tree, ../windows/windows7.glyphs pointed at build/windows/ (which
holds only objects) and the link would fail to embed it.  In-tree the two
trees coincide, so the resulting .wasm is unchanged.

(Static edit; not runtime-verified — emscripten is not available here.)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Darryl L. Miles 2026-07-22 13:59:40 +00:00 committed by R. Timothy Edwards
parent d0b0557915
commit 579c05feea
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolchains/emscripten/defs.mak
View File

@ -26,8 +26,11 @@ MAKE_WASM = 1
LINK = $(LD) -r $(LDFLAGS) LINK = $(LD) -r $(LDFLAGS)
# Emscripten linker flags. # Emscripten linker flags.
# The link step runs from the magic/ subdirectory, so embed-file paths # The link step runs from the magic/ build subdirectory. Embed-file inputs
# are relative to that directory (../scmos, ../windows/...). # must name the *right tree*: generated data (the scmos tech files, produced by
# `make techs`) lives in the build tree, so use ${MAGICDIR} (the build top);
# verbatim data (the window glyphs, shipped as source) lives in the source tree,
# so use ${MAGICSRC}. In-tree the two coincide.
# #
# INCOMING_MODULE_JS_API is emscripten's default list plus `wasmBinary`. # INCOMING_MODULE_JS_API is emscripten's default list plus `wasmBinary`.
# Our JS loaders (npm/examples/*.js) pass Module.wasmBinary to embed the .wasm, # Our JS loaders (npm/examples/*.js) pass Module.wasmBinary to embed the .wasm,
@ -52,6 +55,6 @@ TOP_EXTRA_LIBS += \
-sENVIRONMENT=node,web,worker \ -sENVIRONMENT=node,web,worker \
-sFORCE_FILESYSTEM=1 \ -sFORCE_FILESYSTEM=1 \
${TOP_EXTRA_LIBS_WASM} \ ${TOP_EXTRA_LIBS_WASM} \
--embed-file ../scmos@/magic/sys/current \ --embed-file ${MAGICDIR}/scmos@/magic/sys/current \
--embed-file ../windows/windows7.glyphs@/magic/sys/windows7.glyphs \ --embed-file ${MAGICSRC}/windows/windows7.glyphs@/magic/sys/windows7.glyphs \
--embed-file ../windows/windows7.glyphs@/magic/sys/bw.glyphs --embed-file ${MAGICSRC}/windows/windows7.glyphs@/magic/sys/bw.glyphs