From 1fa27b7f096d5b12712ce0ee9ad6452f38803054 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 8 Feb 2025 10:50:04 +0100 Subject: [PATCH] build: Fix remaining wasm build issues --- dist/web/Dockerfile | 1 + lib/libimhex/include/hex/plugin.hpp | 4 ++-- main/gui/source/window/web_window.cpp | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dist/web/Dockerfile b/dist/web/Dockerfile index 18bebb4e4..3d9c35357 100644 --- a/dist/web/Dockerfile +++ b/dist/web/Dockerfile @@ -68,6 +68,7 @@ cmake /imhex -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \ + -DLIBROMFS_COMPRESS_RESOURCES=OFF \ -DCMAKE_BUILD_TYPE=Release ninja -j $JOBS diff --git a/lib/libimhex/include/hex/plugin.hpp b/lib/libimhex/include/hex/plugin.hpp index f31299f2a..184b9dd38 100644 --- a/lib/libimhex/include/hex/plugin.hpp +++ b/lib/libimhex/include/hex/plugin.hpp @@ -88,7 +88,7 @@ void* PluginSubCommandsFunctionHelper::getSubCommands() { ImGui::SetCurrentContext(ctx); \ GImGui = ctx; \ } \ - IMHEX_PLUGIN_VISIBILITY_PREFIX void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() { \ + extern "C" void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() { \ hex::PluginManager::addPlugin(name, hex::PluginFunctions { \ nullptr, \ WOLV_TOKEN_CONCAT(initializeLibrary_, IMHEX_PLUGIN_NAME), \ @@ -124,7 +124,7 @@ void* PluginSubCommandsFunctionHelper::getSubCommands() { return PluginSubCommandsFunctionHelper::getSubCommands(); \ } \ IMHEX_PLUGIN_VISIBILITY_PREFIX void initializePlugin(); \ - IMHEX_PLUGIN_VISIBILITY_PREFIX void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() { \ + extern "C" void WOLV_TOKEN_CONCAT(forceLinkPlugin_, IMHEX_PLUGIN_NAME)() { \ hex::PluginManager::addPlugin(name, hex::PluginFunctions { \ initializePlugin, \ nullptr, \ diff --git a/main/gui/source/window/web_window.cpp b/main/gui/source/window/web_window.cpp index 032d4934d..a62aa1c7d 100644 --- a/main/gui/source/window/web_window.cpp +++ b/main/gui/source/window/web_window.cpp @@ -10,6 +10,8 @@ #include #include +#include + #include #include