mirror of
https://github.com/Interlisp/maiko.git
synced 2026-03-01 09:30:56 +00:00
1. Replace wasm build with wasm_nl builds and get rid of wasm_nl flag. Update buildRelease.yml and makeright accordingly. 2. Add -lidbfs.js flag to LDFLAGS in makefile-emscripten-wasm.wasm. 3. Update buildRelease.yml docker action versions to accomdate github moving from node 16 to node 20.
This commit is contained in:
@@ -10,22 +10,8 @@ XFLAGS = -DSDL -sUSE_SDL=2
|
||||
OPTFLAGS = -O2
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
|
||||
|
||||
MEDLEY?=../../medley
|
||||
SYSOUT?=$(MEDLEY)/loadups/full.sysout
|
||||
|
||||
LD = emcc
|
||||
LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 \
|
||||
--preload-file $(SYSOUT)@medley/loadups/full.sysout \
|
||||
--preload-file $(MEDLEY)/loadups/whereis.hash@medley/loadups/whereis.hash \
|
||||
--preload-file $(MEDLEY)/greetfiles/MEDLEYDIR-INIT.LCOM@usr/local/lde/site-init.lisp \
|
||||
--preload-file $(MEDLEY)/docs/@medley/docs \
|
||||
--preload-file $(MEDLEY)/doctools/@medley/doctools \
|
||||
--preload-file $(MEDLEY)/greetfiles/@medley/greetfiles \
|
||||
--preload-file $(MEDLEY)/internal/@medley/internal \
|
||||
--preload-file $(MEDLEY)/sources/@medley/sources \
|
||||
--preload-file $(MEDLEY)/library/@medley/library \
|
||||
--preload-file $(MEDLEY)/lispusers/@medley/lispusers \
|
||||
--preload-file $(MEDLEY)/fonts/@medley/fonts
|
||||
LDFLAGS = -lidbfs.js -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
|
||||
|
||||
LDELDFLAGS =
|
||||
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
# Options for Emscripten, WASM and SDL
|
||||
|
||||
CC = emcc $(CLANG_CFLAGS)
|
||||
|
||||
XFILES = $(OBJECTDIR)sdl.o
|
||||
|
||||
XFLAGS = -DSDL -sUSE_SDL=2
|
||||
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O2
|
||||
DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
|
||||
|
||||
MEDLEY?=../../medley
|
||||
SYSOUT?=$(MEDLEY)/loadups/full.sysout
|
||||
|
||||
LD = emcc
|
||||
LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
|
||||
|
||||
LDELDFLAGS =
|
||||
|
||||
OBJECTDIR = ../$(RELEASENAME)/
|
||||
|
||||
default : ../$(OSARCHNAME)/ldesdl.js
|
||||
@@ -20,7 +20,7 @@
|
||||
# Nov 20 2001 JDS: Convert to use BASH, not CSH, for open-source...
|
||||
#
|
||||
# usage: makeright [display-option] [other-option]
|
||||
#
|
||||
#
|
||||
# example: makeright single ; make lde for mmaped displayFB
|
||||
# makeright multi ; make lde for cg3,cg6
|
||||
# makeright x ; make lde for X-windows
|
||||
@@ -79,11 +79,6 @@ case "$display" in
|
||||
releasename=${osversion}.${architecture}-${display}
|
||||
ldename=ldesdl.js
|
||||
;;
|
||||
wasm_nl) osversion=emscripten
|
||||
architecture=wasm_nl
|
||||
releasename=${osversion}.${architecture}-${display}
|
||||
ldename=ldesdl.js
|
||||
;;
|
||||
*) echo "display-option: $display is not supported."
|
||||
exit
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user