Package wasm artifacts and fix musl arm64 linking

This commit is contained in:
moonpower
2026-04-08 07:19:16 +02:00
parent 29d29f1cca
commit ca1fd1e493
2 changed files with 18 additions and 4 deletions
+14 -3
View File
@@ -544,10 +544,21 @@ jobs:
set -euo pipefail
source "$HOME/emsdk/emsdk_env.sh"
./build.sh wasm
mkdir -p artifacts/wasm
rm -rf artifacts/wasm/package
mkdir -p artifacts/wasm/package/wasm
cp bin/wasm/armsx.html artifacts/wasm/package/wasm/
cp bin/wasm/armsx.js artifacts/wasm/package/wasm/
cp bin/wasm/armsx.wasm artifacts/wasm/package/wasm/
if [ -f bin/wasm/armsx.data ]; then
cp bin/wasm/armsx.data artifacts/wasm/package/wasm/
fi
if [ -d bin/wasm/icons ]; then
mkdir -p artifacts/wasm/package/wasm/icons
cp -R bin/wasm/icons/. artifacts/wasm/package/wasm/icons/
fi
(
cd bin
zip -r ../artifacts/wasm/armsx-wasm.zip wasm
cd artifacts/wasm/package
zip -r ../armsx-wasm.zip wasm
)
- uses: actions/upload-artifact@v3
+4 -1
View File
@@ -175,9 +175,12 @@ sdl_cflags="$(pkg-config --cflags sdl2)"
sdl_libs="$(pkg-config --libs sdl2)"
platform_extra_ldflags="-static-libstdc++ -static-libgcc"
case "$target" in
arm64|arm32)
arm32)
platform_extra_ldflags="$platform_extra_ldflags -Wl,-Bstatic -latomic -Wl,-Bdynamic"
;;
arm64)
platform_extra_ldflags="$platform_extra_ldflags -Wl,-Bstatic -latomic -lgcc -Wl,-Bdynamic"
;;
esac
rm -rf "$fsui_build_dir" "$artifact_root"