From d18ecc0cef6b0a4438c494625c6b626658ce5447 Mon Sep 17 00:00:00 2001 From: Kevin Reinholz Date: Thu, 10 Jul 2025 19:10:05 -0700 Subject: [PATCH] Sync fork with cmu-project:main, add BOOST_OS_BSD to the conditional include of resource/embedded/resources.h in the new src/gui/input/HotkeySettings.cpp file --- src/gui/input/HotkeySettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/input/HotkeySettings.cpp b/src/gui/input/HotkeySettings.cpp index 2586b36d..d9a32ad9 100644 --- a/src/gui/input/HotkeySettings.cpp +++ b/src/gui/input/HotkeySettings.cpp @@ -4,7 +4,7 @@ #include "input/InputManager.h" #include "HotkeySettings.h" -#if BOOST_OS_LINUX || BOOST_OS_MACOS +#if BOOST_OS_LINUX || BOOST_OS_MACOS || BOOST_OS_BSD #include "resource/embedded/resources.h" #endif