From 2b72d08e3947bfde6704654ec462f3326968c0b7 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Thu, 24 Jul 2025 10:52:08 +0200
Subject: [PATCH] build: Fix and re-enable Web build

---
 .github/workflows/build.yml      | 1 -
 dist/web/Dockerfile              | 5 +++--
 main/gui/source/init/run/web.cpp | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 37bba939d..5c9e1b054 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1201,7 +1201,6 @@ jobs:
   webassembly-build:
     runs-on: ubuntu-24.04
     name: 🌍 Web
-    if: false
     permissions:
       pages: write
       id-token: write
diff --git a/dist/web/Dockerfile b/dist/web/Dockerfile
index 46f4824a0..d5289daa3 100644
--- a/dist/web/Dockerfile
+++ b/dist/web/Dockerfile
@@ -5,7 +5,7 @@ FROM emscripten/emsdk:4.0.8 AS build
 ARG UNIQUEKEY 1
 
 RUN apt update
-RUN apt install -y git ccache autoconf automake libtool cmake pkg-config ninja-build
+RUN apt install -y git ccache autoconf automake libtool pkg-config ninja-build
 
 RUN <<EOF
 # Install vcpkg
@@ -56,7 +56,7 @@ RUN --mount=type=cache,target=/cache \
 set -xe
 ccache -zs
 
-cmake /imhex                                                                                            \
+/vcpkg/downloads/tools/cmake-*/cmake-*/bin/cmake /imhex                                                                                            \
     -G "Ninja"                                                                                          \
     -DIMHEX_OFFLINE_BUILD=ON                                                                            \
     -DIMHEX_STATIC_LINK_PLUGINS=ON                                                                      \
@@ -69,6 +69,7 @@ cmake /imhex
     -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake                                      \
     -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
     -DLIBROMFS_COMPRESS_RESOURCES=OFF                                                                   \
+    -DIMHEX_ENABLE_PLUGIN_TESTS=OFF                                                                     \
     -DCMAKE_BUILD_TYPE=Release
 
 ninja -j $JOBS
diff --git a/main/gui/source/init/run/web.cpp b/main/gui/source/init/run/web.cpp
index d1cf91664..c28c30cfc 100644
--- a/main/gui/source/init/run/web.cpp
+++ b/main/gui/source/init/run/web.cpp
@@ -25,6 +25,12 @@
         }
 
         int runImHex() {
+            // Initialize GLFW
+            if (!glfwInit()) {
+                log::fatal("Failed to initialize GLFW!");
+                std::abort();
+            }
+
             static std::unique_ptr<init::WindowSplash> splashWindow;
             splashWindow = initializeImHex();