From 23d673f9203ed358e14d9d91f8ff60fd82e74eff Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sun, 10 Aug 2025 22:38:12 +0200 Subject: [PATCH] fix: Multiple FreeBSD build and run errors --- lib/external/libwolv | 2 +- main/gui/source/messaging/linux.cpp | 2 ++ main/gui/source/window/window.cpp | 2 +- main/updater/CMakeLists.txt | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/external/libwolv b/lib/external/libwolv index 95efb87f5..8427d4da7 160000 --- a/lib/external/libwolv +++ b/lib/external/libwolv @@ -1 +1 @@ -Subproject commit 95efb87f5d17807daaba53f8fcc4618136cdae65 +Subproject commit 8427d4da728c08bc8f554600c1179dd2297d9eca diff --git a/main/gui/source/messaging/linux.cpp b/main/gui/source/messaging/linux.cpp index a25c0f5bc..115f1aced 100644 --- a/main/gui/source/messaging/linux.cpp +++ b/main/gui/source/messaging/linux.cpp @@ -3,6 +3,8 @@ #include #include #include +#include +#include #include #include diff --git a/main/gui/source/window/window.cpp b/main/gui/source/window/window.cpp index 3114db15b..cb7b79f14 100644 --- a/main/gui/source/window/window.cpp +++ b/main/gui/source/window/window.cpp @@ -352,7 +352,7 @@ namespace hex { while (frameTime < targetFrameTime - longestExceededFrameTime) { auto remainingFrameTime = targetFrameTime - frameTime; - glfwWaitEventsTimeout(remainingFrameTime); + glfwWaitEventsTimeout(std::min(remainingFrameTime, 1000.0)); auto newFrameTime = glfwGetTime() - frameTimeStart; diff --git a/main/updater/CMakeLists.txt b/main/updater/CMakeLists.txt index a5f48c35c..af4f58e9f 100644 --- a/main/updater/CMakeLists.txt +++ b/main/updater/CMakeLists.txt @@ -5,7 +5,12 @@ add_executable(updater ) target_compile_definitions(updater PRIVATE IMHEX_PROJECT_NAME="${PROJECT_NAME}") + target_link_libraries(updater PRIVATE libimhex ${FMT_LIBRARIES}) +if (UNIX OR BSD) + target_link_libraries(updater PRIVATE pthread) +endif() + add_dependencies(main updater) setupCompilerFlags(updater)