feat: pull latest rust-sdl2-emscripten build workflow

scripts/build-wasm.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-# set -eu
-
-echo "Building WASM with Emscripten"
-cargo build --target=wasm32-unknown-emscripten --release
-
-echo "Copying release files to dist/"
-mkdir -p dist
-output_folder="target/wasm32-unknown-emscripten/release"
-cp $output_folder/pacman.wasm dist
-cp $output_folder/pacman.js dist
-cp $output_folder/deps/pacman.data dist
-cp assets/index.html dist

scripts/build-windows.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-set -eu
-
-SDL_VERSION="2.28.3"
-SDL_IMAGE_VERSION="2.6.3"
-SDL_MIXER_VERSION="2.6.3"
-SDL_TTF_VERSION="2.20.2"
-
-SDL="https://github.com/libsdl-org/SDL/releases/download/release-${SDL_VERSION}/SDL2-devel-${SDL_VERSION}-mingw.tar.gz"
-SLD_IMAGE="https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL_IMAGE_VERSION}/SDL2_image-devel-${SDL_IMAGE_VERSION}-mingw.tar.gz"
-SDL_MIXER="https://github.com/libsdl-org/SDL_mixer/releases/download/release-${SDL_MIXER_VERSION}/SDL2_mixer-devel-${SDL_MIXER_VERSION}-mingw.tar.gz"
-SDL_TTF="https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL_TTF_VERSION}/SDL2_ttf-devel-${SDL_TTF_VERSION}-mingw.tar.gz"
-
-EXTRACT_DIR="./target/x86_64-pc-windows-gnu/release/deps"
-
-if [ ! -f $EXTRACT_DIR/libSDL2.a ]; then
-    if [ ! -f ./sdl2.tar.gz ]; then
-        echo "Downloading SDL2@$SDL_VERSION..."
-        curl -L -o ./sdl2.tar.gz $SDL
-    fi
-    echo "Extracting SDL2..."
-    tar -xzf ./sdl2.tar.gz -C $EXTRACT_DIR --strip-components=3 "SDL2-$SDL_VERSION/x86_64-w64-mingw32/lib/libSDL2.a"
-    rm -f ./sdl2.tar.gz
-fi
-
-if [ ! -f $EXTRACT_DIR/libSDL2_image.a ]; then
-    if [ ! -f ./sdl2_image.tar.gz ]; then
-        echo "Downloading SDL2_image@$SDL_IMAGE_VERSION..."
-        curl -L -o ./sdl2_image.tar.gz $SLD_IMAGE
-    fi
-    echo "Extracting SDL2_image..."
-    tar -xzf ./sdl2_image.tar.gz -C $EXTRACT_DIR --strip-components=3 "SDL2_image-$SDL_IMAGE_VERSION/x86_64-w64-mingw32/lib/libSDL2_image.a"
-fi
-rm -f ./sdl2_image.tar.gz
-
-if [ ! -f $EXTRACT_DIR/libSDL2_mixer.a ]; then
-    if [ ! -f ./sdl2_mixer.tar.gz ]; then
-        echo "Downloading SDL2_mixer@$SDL_MIXER_VERSION..."
-        curl -L -o ./sdl2_mixer.tar.gz $SDL_MIXER
-    fi
-    echo "Extracting SDL2_mixer..."
-    tar -xzf ./sdl2_mixer.tar.gz -C $EXTRACT_DIR --strip-components=3 "SDL2_mixer-$SDL_MIXER_VERSION/x86_64-w64-mingw32/lib/libSDL2_mixer.a"
-    rm -f ./sdl2_mixer.tar.gz
-fi
-
-if [ ! -f $EXTRACT_DIR/libSDL2_ttf.a ]; then
-    
-    if [ ! -f ./sdl2_ttf.tar.gz ]; then
-        echo "Downloading SDL2_ttf@$SDL_TTF_VERSION..."
-        curl -L -o ./sdl2_ttf.tar.gz $SDL_TTF
-    fi
-    echo "Extracting SDL2_ttf..."
-    tar -xzf ./sdl2_ttf.tar.gz -C $EXTRACT_DIR --strip-components=3 "SDL2_ttf-$SDL_TTF_VERSION/x86_64-w64-mingw32/lib/libSDL2_ttf.a"
-    rm -f ./sdl2_ttf.tar.gz
-fi
-
-echo "Building..."
-cargo zigbuild --release --target x86_64-pc-windows-gnu

scripts/build.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+set -eu
+
+release='false'
+serve='false'
+skip_emsdk='false'
+clean='false'
+
+print_usage() {
+    printf "Usage: -erdsc\n"
+    printf "  -e: Skip EMSDK setup (GitHub workflow only)\n"
+    printf "  -r: Build in release mode\n"
+    printf "  -d: Build in debug mode\n"
+    printf "  -s: Serve the WASM files once built\n"
+    printf "  -c: Clean the target/dist directory\n"
+}
+
+while getopts 'erdsc' flag; do
+    case "${flag}" in
+    e) skip_emsdk='true' ;;
+    r) release='true' ;;
+    d) release='false' ;; # doesn't actually do anything, but last flag wins
+    s) serve='true' ;;
+    c) clean='true' ;;
+    *)
+        print_usage
+        exit 1
+        ;;
+    esac
+done
+
+if [ "$clean" = 'true' ]; then
+    echo "Cleaning target directory"
+    cargo clean
+    rm -rf ./dist/
+fi
+
+if [ "$skip_emsdk" = 'false' ]; then
+    echo "Activating Emscripten"
+    # SDL2-TTF requires 3.1.43, fails to build on latest
+    ./../emsdk/emsdk activate 3.1.43
+    source ../emsdk/emsdk_env.sh
+fi
+
+echo "Building WASM with Emscripten"
+build_type='debug'
+if [ "$release" = 'true' ]; then
+    cargo build --target=wasm32-unknown-emscripten --release
+    build_type='release'
+else
+    cargo build --target=wasm32-unknown-emscripten
+fi
+
+echo "Generating CSS"
+pnpx postcss-cli ./assets/styles.scss -o ./assets/build.css
+
+echo "Copying WASM files"
+mkdir -p dist
+output_folder="target/wasm32-unknown-emscripten/$build_type"
+cp assets/index.html dist
+
+cp assets/*.woff* dist
+cp assets/build.css dist
+cp assets/favicon.ico dist
+cp $output_folder/spiritus.wasm dist
+cp $output_folder/spiritus.js dist
+# only if .data file exists
+cp $output_folder/deps/spiritus.data dist
+if [ -f $output_folder/spiritus.wasm.map ]; then
+    cp $output_folder/spiritus.wasm.map dist
+fi
+
+if [ "$serve" = 'true' ]; then
+    echo "Serving WASM with Emscripten"
+    python3 -m http.server -d ./dist/ 8080
+fi

scripts/clean-windows.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -eux
-
-echo "Cleaning library files from ./target/x86_64-pc-windows-gnu/release/deps"
-rm -f ./target/x86_64-pc-windows-gnu/release/deps/libSDL2.a
-rm -f ./target/x86_64-pc-windows-gnu/release/deps/libSDL2_image.a
-rm -f ./target/x86_64-pc-windows-gnu/release/deps/libSDL2_mixer.a
-rm -f ./target/x86_64-pc-windows-gnu/release/deps/libSDL2_ttf.a
-echo "Done."