1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-03-15 22:37:22 +00:00

Compare commits

..

8 Commits

Author SHA1 Message Date
Frank Halasz
163d5db50f Backing out LD/CC change in makefile-tail. Adding comment in makefile-emscripten 2024-02-16 01:25:04 -08:00
Frank Halasz
a1dff20adb Merge branch 'fgh_emscripten-vmem_save' into fgh_emscripten-combined 2024-02-16 00:45:07 -08:00
Frank Halasz
5f69aa4242 Update buildRelease workflow to accomodate move from wasm_nl to wasm. 2024-02-16 00:41:47 -08:00
Frank Halasz
7564790bfe Remove debugging code and add -DMAIKO_OS_EMSCRIPTEN to makefile-emscripten.wasm-wasm 2024-02-16 00:22:31 -08:00
Frank Halasz
fa17cddf68 Merge branch 'fgh_emscripten-02' of https://github.com/Interlisp/maiko into fgh_emscripten-02 2024-02-14 22:20:48 -08:00
Frank Halasz
6793137280 Merge branch 'master' into fgh_emscripten-02 2024-02-14 22:07:40 -08:00
Frank Halasz
610b7f42bb 1. Fixed makefile-tail so it uses $(LD) for linker operations instead of $(CC);
$(LD) is set to $(CC) if $(LD) not set before makefile-tail.
2. In makefile-tail added $(UPFRONT_LDFLAGS) to accomdate emscripten build
   where -lidbfs.js needs to come before files in ld call.
3) replaced wasm builds with wasm_nl builds; removed wasm_nl builds.
2024-02-13 12:49:55 -08:00
Frank Halasz
461b6a901c WIP. Adding -lidbfs.js to emscripten build 2024-02-13 10:34:01 -08:00
3 changed files with 8 additions and 7 deletions

View File

@@ -185,14 +185,14 @@ jobs:
# Setup the Docker Machine Emulation environment.
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v2
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7
# Setup the Docker Buildx funtion
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v2
# Do the Docker Build using the Dockerfile in the repository we
# checked out. Save the results in a directory under /tmp to be used
@@ -204,7 +204,7 @@ jobs:
# Dockerfile, NOT HERE IN THE WORKFLOW.
#
- name: Build Docker Image and Save It Locally
uses: docker/build-push-action@v5
uses: docker/build-push-action@v4
with:
builder: ${{ steps.buildx.outputs.name }}
build-args: |
@@ -503,7 +503,6 @@ jobs:
- name: Install SDL2
run: |
export DEBIAN_FRONTEND=noninteractive
sudo -E apt-get update
sudo -E apt-get install -y libsdl2-dev libsdl2-2.0-0
# Install Emscripten SDK

View File

@@ -8,10 +8,12 @@ XFLAGS = -DSDL -sUSE_SDL=2
# OPTFLAGS is normally -O2.
OPTFLAGS = -O2
DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_OS_EMSCRIPTEN -DMAIKO_ENABLE_NETHUB
# LD not really used - but keeping it here just in case
LD = emcc
LDFLAGS = -lidbfs.js -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
UPFRONT_LDFLAGS = -lidbfs.js
LDELDFLAGS =

View File

@@ -148,7 +148,7 @@ $(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o
$(CC) $(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)
$(CC) $(UPFRONT_LDFLAGS) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME)
@ echo ""
@ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'"