diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 76abf89..c9caabd 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -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 diff --git a/scripts/ci/build-linux-musl-target.sh b/scripts/ci/build-linux-musl-target.sh index 1633219..7572677 100755 --- a/scripts/ci/build-linux-musl-target.sh +++ b/scripts/ci/build-linux-musl-target.sh @@ -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"