Add Emscripten builds

Author: HexDecimal

.github/workflows/cmake.yml

@@ -28,7 +28,7 @@ jobs:
             butler-url: https://broth.itch.ovh/butler/windows-amd64/LATEST/archive/default
           - os: macos-14
             triplet: arm64-osx
-            platform-name: macos.x64
+            platform-name: macos.arm64
             butler-url: https://broth.itch.ovh/butler/darwin-amd64/LATEST/archive/default
           - os: ubuntu-24.04
             triplet: x64-linux
@@ -128,7 +128,7 @@ jobs:
           tag: ${{ github.ref }}
           overwrite: true
       - name: Install Butler
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/main' && matrix.butler-url
         run: |
           mkdir ~/bin
           cd ~/bin
@@ -138,7 +138,75 @@ jobs:
           echo "~/bin" >> $GITHUB_PATH
           ~/bin/butler -V
       - name: Upload to Itch
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/main' && matrix.butler-url
         env:
           BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
         run: butler push dist/${{ env.archive-name }} hexdecimal/${{ env.project-name }}:${{ matrix.platform-name }}-latest
+
+  emscripten:
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+       build_type: [Debug, Release]
+    env:
+      EM_VERSION: 4.0.5
+      EM_CACHE_FOLDER: "emsdk-cache"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Restore vcpkg and its artifacts
+        uses: actions/cache@v4
+        with:
+          path: |
+            build/vcpkg_installed/
+            ${{ env.VCPKG_ROOT }}
+            !${{ env.VCPKG_ROOT }}/buildtrees
+            !${{ env.VCPKG_ROOT }}/packages
+            !${{ env.VCPKG_ROOT }}/downloads
+          key: wasm32-emscripten-${{ hashFiles('vcpkg.json', '.git/modules/vcpkg/HEAD') }}
+      - name: Setup cache
+        id: cache-system-libraries
+        uses: actions/cache@v4
+        with:
+          path: ${{env.EM_CACHE_FOLDER}}
+          key: ${{env.EM_VERSION}}-${{ runner.os }}
+      - uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: ${{env.EM_VERSION}}
+          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
+      - name: Verify
+        run: emcc -v
+      - uses: lukka/get-cmake@latest
+      - name: Configure
+        run: emcmake cmake -S . -B build -G Ninja
+          -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE="${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+          -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
+          -DVCPKG_TARGET_TRIPLET=wasm32-emscripten
+          -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}"
+      - name: Build
+        run: cmake --build build
+      - name: Show contents of the build directory
+        run: find build
+      - uses: actions/upload-artifact@v4
+        with:
+          name: emscripten-${{ matrix.build_type }}
+          path: build/bin
+          retention-days: 7
+          if-no-files-found: error
+          compression-level: 6
+      - name: Install Butler
+        if: github.ref == 'refs/heads/main' && matrix.build_type == 'Release'
+        run: |
+          mkdir ~/bin
+          cd ~/bin
+          curl -L -o butler.zip https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default
+          unzip butler.zip
+          chmod +x butler
+          echo "~/bin" >> $GITHUB_PATH
+          ~/bin/butler -V
+      - name: Upload to Itch
+        if: github.ref == 'refs/heads/main' && matrix.build_type == 'Release'
+        env:
+          BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
+        run: butler push dist/${{ env.archive-name }} hexdecimal/${{ env.project-name }}:emscripten-latest

CMakeLists.txt

@@ -33,6 +33,18 @@ else()
     target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
 endif()
 
+if (EMSCRIPTEN)
+    # Attach data folder to Emscripten builds.
+    target_link_options(${PROJECT_NAME} PRIVATE
+        "SHELL:--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/data@data"
+        -lidbfs.js  # Enable IDBFS (browser file system.)
+    )
+    configure_file(
+        ${PROJECT_SOURCE_DIR}/emscripten/index.html
+        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/index.html
+    )
+endif()
+
 target_compile_definitions(${PROJECT_NAME} PRIVATE _USE_MATH_DEFINES)  # For M_PI
 target_compile_definitions(${PROJECT_NAME} PRIVATE NO_SOUND)
 target_compile_definitions(${PROJECT_NAME} PRIVATE NO_LUA)

emscripten/index.html

@@ -0,0 +1,40 @@
+<!doctype HTML>
+<html lang=en-us>
+
+<head>
+  <meta charset=utf-8>
+  <title>Pyromancer</title>
+  <style>
+    body {
+      background-color: #000;
+      margin: 0;
+      padding: none;
+    }
+
+    .center {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    canvas {
+      aspect-ratio: 80 / 60;
+      width: calc(min(100vw, 80 / 60 * 100vh));
+    }
+  </style>
+</head>
+
+<body onload=window.focus()>
+  <div class=center>
+    <canvas id=canvas oncontextmenu=event.preventDefault() tabindex=-1 onclick=window.focus()></canvas>
+  </div>
+  <script>
+    var Module = {
+      print(...args) { console.log("%s", ...args); },
+      canvas: document.getElementById('canvas'),
+    };
+  </script>
+  <script async src=${PROJECT_NAME}.js></script>
+</body>
+
+</html>

src/main.cpp

@@ -25,6 +25,7 @@
 */
 #define SDL_MAIN_USE_CALLBACKS
 #include <SDL3/SDL_main.h>
+#include <SDL3/SDL_log.h>
 #include <time.h>
 #include <stdio.h>
 #include "main.hpp"
@@ -163,6 +164,7 @@ SDL_AppResult SDL_AppEvent(void*, SDL_Event* event) { return engine.onEvent(*eve
 SDL_AppResult SDL_AppIterate(void*) { return engine.onFrame(); }
 
 SDL_AppResult SDL_AppInit(void**, int argc, char** argv) {
+	SDL_SetLogPriorities(SDL_LOG_PRIORITY_VERBOSE);
 	// read main configuration file
 	config.run("data/cfg/config.txt",NULL);
 	ConditionType::init();
@@ -193,12 +195,8 @@ SDL_AppResult SDL_AppInit(void**, int argc, char** argv) {
 
 	sound.initialize();
 	engine.setKeyboardMode(UMBRA_KEYBOARD_SDL);
-    if (engine.initialise(TCOD_RENDERER_SDL2)) {
-		//engine.run();
-		//return SDL_APP_SUCCESS;
-		return SDL_APP_CONTINUE;
-	}
-	return SDL_APP_FAILURE;
+	if (!engine.initialise(TCOD_RENDERER_SDL2)) return SDL_APP_FAILURE;
+	return SDL_APP_CONTINUE;
 }
 
 void SDL_AppQuit(void*, SDL_AppResult) {