diff --git a/bin/makefile-emscripten.wasm-wasm b/bin/makefile-emscripten.wasm-wasm index 8d88423..3486fa5 100644 --- a/bin/makefile-emscripten.wasm-wasm +++ b/bin/makefile-emscripten.wasm-wasm @@ -1,6 +1,6 @@ # Options for Emscripten, WASM and SDL -CC = emcc $(CLANG_CFLAGS) +CC = emcc $(CLANG_CFLAGS) -lidbfs.js XFILES = $(OBJECTDIR)sdl.o @@ -10,22 +10,9 @@ 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 +LD = emcc -sLZ4 +LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4 +UPFRONT_LDFLAGS = -lidbfs.js LDELDFLAGS = diff --git a/bin/makefile-emscripten.wasm_nl-wasm_nl b/bin/makefile-emscripten.wasm_nl-wasm_nl deleted file mode 100644 index a935c9b..0000000 --- a/bin/makefile-emscripten.wasm_nl-wasm_nl +++ /dev/null @@ -1,20 +0,0 @@ -# Options for Emscripten, WASM and SDL - -CC = emcc $(CLANG_CFLAGS) -lidbfs.js - -XFILES = $(OBJECTDIR)sdl.o - -XFLAGS = -DSDL -sUSE_SDL=2 - -# OPTFLAGS is normally -O2. -OPTFLAGS = -O2 -DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB - -LD = emcc -LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4 - -LDELDFLAGS = - -OBJECTDIR = ../$(RELEASENAME)/ - -default : ../$(OSARCHNAME)/ldesdl.js diff --git a/bin/makefile-tail b/bin/makefile-tail index 0e78d42..72e3032 100644 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -35,6 +35,7 @@ REQUIRED-INCS = $(INCDIR)version.h $(INCDIR)maiko/platform.h +LD ?= $(CC) CFLAGS = $(OPTFLAGS) $(DFLAGS) RFLAGS = -c $(CFLAGS) -I$(INCDIR) -I$(INCLUDEDIR) @@ -145,21 +146,21 @@ EXTFILES = $(OBJECTDIR)usrsubr.o ################################################################################ $(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o - $(CC) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde + $(LD) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde $(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o - $(CC) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME) - @ echo "HELLO HELLO HELLO HELLO" + $(LD) $(UPFRONT_LDFLAGS) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME) + @ echo "" @ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'" $(OSARCHDIR)ldeether: $(OBJECTDIR)ldeether.o $(DLPIFILES) - $(CC) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether + $(LD) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether $(OSARCHDIR)tstsout: $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(REQUIRED-INCS) - $(CC) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout + $(LD) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout $(OSARCHDIR)setsout: $(OBJECTDIR)setsout.o $(REQUIRED-INCS) - $(CC) $(OBJECTDIR)setsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)setsout + $(LD) $(OBJECTDIR)setsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)setsout #### Component files ###################################################### diff --git a/bin/makeright b/bin/makeright index 25f21f1..bff5745 100755 --- a/bin/makeright +++ b/bin/makeright @@ -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 ;;