From 7bb23936375de78eba7c9d37494bfe6787cde691 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Wed, 27 Dec 2023 17:20:11 -0800 Subject: [PATCH] Adjustments to WAsm file system layout and compilation options Moves the full.sysout from the root of tle system to /medley/loadups/full.sysout, adds /medley/lispusers/BACKGROUND-YIELD.LCOM and an Emscripten/WAsm specific site init file at /usr/local/lde/site-init.lisp Adjusts options so that the options are in the correct place for the compiler and loader. --- bin/makefile-emscripten.wasm-wasm | 12 +++++++++--- src/lde.html | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/makefile-emscripten.wasm-wasm b/bin/makefile-emscripten.wasm-wasm index f092375..64b631a 100644 --- a/bin/makefile-emscripten.wasm-wasm +++ b/bin/makefile-emscripten.wasm-wasm @@ -4,14 +4,20 @@ CC = emcc $(CLANG_CFLAGS) XFILES = $(OBJECTDIR)sdl.o -XFLAGS = -DSDL +XFLAGS = -DSDL -sUSE_SDL=2 # OPTFLAGS is normally -O2. -OPTFLAGS = -O2 -g3 +OPTFLAGS = -O2 DFLAGS = $(XFLAGS) -DRELEASE=351 +MEDLEY?=../../medley +SYSOUT?=$(MEDLEY)/loadups/full.sysout + LD = emcc -LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH --preload-file $(SYSOUT)@full.sysout +LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH \ + --preload-file $(SYSOUT)@medley/loadups/full.sysout \ + --preload-file $(MEDLEY)/greetfiles/EMSCRIPTEN-INIT.LCOM@usr/local/lde/site-init.lisp \ + --preload-file $(MEDLEY)/lispusers/BACKGROUND-YIELD.LCOM@medley/lispusers/BACKGROUND-YIELD.LCOM LDELDFLAGS = OBJECTDIR = ../$(RELEASENAME)/ diff --git a/src/lde.html b/src/lde.html index 3ddffcd..3c7f8cc 100644 --- a/src/lde.html +++ b/src/lde.html @@ -11,7 +11,7 @@