github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-03-21 16:42:35 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: github.com:fgh_emscripten-combined
Branches Tags
github.com:master github.com:nhb-pcap-ethernet github.com:fgh_makefile-consolidation github.com:lmm-hcfiles-submodule github.com:lmm32-gitignore-for-subproject-maiko github.com:fgh_libbsd github.com:nhb-rewrite-version-parser-v2 github.com:nhb-rewrite-version-parser github.com:fgh_fix-2164-WSL1 github.com:mth38--support-runtime-debug-output github.com:fgh_github-actions-updates github.com:nhb-update-for-sdl3 github.com:wip-nhb-sdl-mouse-fix github.com:fgh_nethub-build github.com:fgh_emscripten-03 github.com:fgh_emscripten-combined github.com:fgh_emscripten-02 github.com:debug-arrayspace github.com:lmm-maiko github.com:build-201 github.com:sdl-texture-direct github.com:multi-val-retun-unbind github.com:no-DOS github.com:pi-init github.com:Fix-Unicode-EOL-convention
github.com:maiko-260301-f4021ef2 github.com:maiko-251031-d791b1d3 github.com:maiko-250616-de1fafba github.com:maiko-250201-55e20ea9 github.com:maiko-250201-7fe0f706 github.com:maiko-250201-7d85a59e github.com:maiko-250126-e61d0f2e github.com:maiko-250128-9628bb1b github.com:maiko-240513-4becc6ad github.com:maiko-240510-fd16058c github.com:maiko-240506-6c6b01f9 github.com:maiko-240424-c3916416 github.com:maiko-240211-ce20acca github.com:maiko-231112-42477318 github.com:maiko-230809-7fce08f9 github.com:maiko-230607-d1f4653b github.com:maiko-220929-f5b17b0e github.com:maiko-220603-b5f51d58 github.com:maiko-220212-20046b26 github.com:maiko-220212-e6a974a2 github.com:maiko-220117-5eba2c3a github.com:maiko-220109 github.com:maiko-211222 github.com:maiko-211203 github.com:maiko-211107 github.com:maiko-211010 github.com:maiko-211022 github.com:maiko-211003 github.com:maiko-210923 github.com:maiko-210917 github.com:maiko-210910 github.com:maiko-210908 github.com:maiko-210905 github.com:maiko-210903 github.com:maiko-210828 github.com:maiko-210825 github.com:testing123 github.com:original-020102-01
..
compare: github.com:fgh_emscripten-03
Branches Tags
github.com:nhb-pcap-ethernet github.com:master github.com:fgh_makefile-consolidation github.com:lmm-hcfiles-submodule github.com:lmm32-gitignore-for-subproject-maiko github.com:fgh_libbsd github.com:nhb-rewrite-version-parser-v2 github.com:nhb-rewrite-version-parser github.com:fgh_fix-2164-WSL1 github.com:mth38--support-runtime-debug-output github.com:fgh_github-actions-updates github.com:nhb-update-for-sdl3 github.com:wip-nhb-sdl-mouse-fix github.com:fgh_nethub-build github.com:fgh_emscripten-03 github.com:fgh_emscripten-combined github.com:fgh_emscripten-02 github.com:debug-arrayspace github.com:lmm-maiko github.com:build-201 github.com:sdl-texture-direct github.com:multi-val-retun-unbind github.com:no-DOS github.com:pi-init github.com:Fix-Unicode-EOL-convention
github.com:maiko-260301-f4021ef2 github.com:maiko-251031-d791b1d3 github.com:maiko-250616-de1fafba github.com:maiko-250201-55e20ea9 github.com:maiko-250201-7fe0f706 github.com:maiko-250201-7d85a59e github.com:maiko-250126-e61d0f2e github.com:maiko-250128-9628bb1b github.com:maiko-240513-4becc6ad github.com:maiko-240510-fd16058c github.com:maiko-240506-6c6b01f9 github.com:maiko-240424-c3916416 github.com:maiko-240211-ce20acca github.com:maiko-231112-42477318 github.com:maiko-230809-7fce08f9 github.com:maiko-230607-d1f4653b github.com:maiko-220929-f5b17b0e github.com:maiko-220603-b5f51d58 github.com:maiko-220212-20046b26 github.com:maiko-220212-e6a974a2 github.com:maiko-220117-5eba2c3a github.com:maiko-220109 github.com:maiko-211222 github.com:maiko-211203 github.com:maiko-211107 github.com:maiko-211010 github.com:maiko-211022 github.com:maiko-211003 github.com:maiko-210923 github.com:maiko-210917 github.com:maiko-210910 github.com:maiko-210908 github.com:maiko-210905 github.com:maiko-210903 github.com:maiko-210828 github.com:maiko-210825 github.com:testing123 github.com:original-020102-01

3 Commits
fgh_emscri ... fgh_emscri

Author SHA1 Message Date
Frank Halasz
eac4cdc3d3 Update install of sdl2 for emscripten in buildRelease workflow. 2024-02-16 12:45:30 -08:00
Frank Halasz
eacdd98f48 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. 2024-02-16 12:32:15 -08:00
Frank Halasz
fb579a2ab5 Merge pull request #491 from Interlisp/fgh_emscripten-vmem_save 
Fix Issue#1541: IL:LOGOUT does not work running Medley on emscripten maiko
 2024-02-16 12:03:31 -08:00
3 changed files with 7 additions and 8 deletions
Expand all files Collapse all files

7
.github/workflows/buildRelease.yml vendored
View File

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

6
bin/makefile-emscripten.wasm-wasm
View File

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

2
bin/makefile-tail
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 $(CC) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde
$(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o
$(CC) $(UPFRONT_LDFLAGS) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME) $(CC) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME)
@ echo "" @ echo ""
@ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'" @ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'"