luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-29 01:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

GHA: main.yml/main-aarch64.yml: WASM build

Browse Source 
-DEMSCRIPTEN=1 appears to not be present any more by default in emcc compiler.

There is -D__EMSCRIPTEN__=1 but that would require modifying many locations
in the codebase which are already being reviewed separately under a single
source multi-platform build cleanup process.

Anyhow maybe ./configure would set -DEMSCRIPTEN=1 itself, much like -Dlinux=1
for other targets.  This commits defers evaluation on that until later and just
restores how it worked before.
This commit is contained in:
Darryl L. Miles
2026-03-26 09:20:07 -04:00
committed by R. Timothy Edwards
parent 003506ba62
commit 2f26237b8b
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/main-aarch64.yml
+13 -1
View File
@@ -33,10 +33,22 @@ jobs:
cd emsdk cd emsdk
./emsdk install latest ./emsdk install latest
./emsdk activate latest ./emsdk activate latest
- name: Emscripten Diagnostic
run: |
source ./emsdk/emsdk_env.sh
echo "===== gcc -dM -E - ====="
echo | gcc -dM -E - | sort
echo "===== g++ -dM -E - ====="
echo | g++ -dM -E - | sort
echo "===== emcc -dM -E - ====="
echo | emcc -dM -E - | sort
echo "===== em++ -dM -E - ====="
echo | em++ -dM -E - | sort
- name: Build - name: Build
run: | run: |
source ./emsdk/emsdk_env.sh source ./emsdk/emsdk_env.sh
emconfigure ./configure --without-cairo --without-opengl --without-x --disable-readline --disable-compression --target=asmjs-unknown-emscripten # The --without and --disable in these build options is due to no WASM library being available for that feature
CFLAGS="--std=c17 -D_DEFAULT_SOURCE=1 -DEMSCRIPTEN=1 -g" emconfigure ./configure --without-cairo --without-opengl --without-x --without-tk --without-tcl --disable-readline --disable-compression --target=asmjs-unknown-emscripten
echo "===== defs.mak =====" echo "===== defs.mak ====="
cat defs.mak cat defs.mak
echo "===== defs.mak =====" echo "===== defs.mak ====="
.github/workflows/main.yml
+13 -1
View File
@@ -32,10 +32,22 @@ jobs:
cd emsdk cd emsdk
./emsdk install latest ./emsdk install latest
./emsdk activate latest ./emsdk activate latest
- name: Emscripten Diagnostic
run: |
source ./emsdk/emsdk_env.sh
echo "===== gcc -dM -E - ====="
echo | gcc -dM -E - | sort
echo "===== g++ -dM -E - ====="
echo | g++ -dM -E - | sort
echo "===== emcc -dM -E - ====="
echo | emcc -dM -E - | sort
echo "===== em++ -dM -E - ====="
echo | em++ -dM -E - | sort
- name: Build - name: Build
run: | run: |
source ./emsdk/emsdk_env.sh source ./emsdk/emsdk_env.sh
emconfigure ./configure --without-cairo --without-opengl --without-x --disable-readline --disable-compression --target=asmjs-unknown-emscripten # The --without and --disable in these build options is due to no WASM library being available for that feature
CFLAGS="--std=c17 -D_DEFAULT_SOURCE=1 -DEMSCRIPTEN=1 -g" emconfigure ./configure --without-cairo --without-opengl --without-x --without-tk --without-tcl --disable-readline --disable-compression --target=asmjs-unknown-emscripten
echo "===== defs.mak =====" echo "===== defs.mak ====="
cat defs.mak cat defs.mak
echo "===== defs.mak =====" echo "===== defs.mak ====="