From 327a554d423ef751d1b84fa25d685648b850b2b2 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Wed, 14 Jan 2026 20:02:03 +0000 Subject: [PATCH] MangoHud: rename to LibraryUtils It handles more than mangohud Signed-off-by: TheKodeToad --- launcher/Application.cpp | 8 ++++---- launcher/CMakeLists.txt | 6 +++--- launcher/{MangoHud.cpp => LibraryUtils.cpp} | 14 +++++++------- launcher/{MangoHud.h => LibraryUtils.h} | 8 ++++---- launcher/minecraft/MinecraftInstance.cpp | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) rename launcher/{MangoHud.cpp => LibraryUtils.cpp} (94%) rename launcher/{MangoHud.h => LibraryUtils.h} (87%) diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 50fd32d5b..3b7c88ee0 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -130,7 +130,7 @@ #ifdef Q_OS_LINUX #include -#include "MangoHud.h" +#include "LibraryUtils.h" #include "gamemode_client.h" #endif @@ -1855,7 +1855,7 @@ void Application::updateCapabilities() if (gamemode_query_status() >= 0) m_capabilities |= SupportsGameMode; - if (!MangoHud::getLibraryString().isEmpty()) + if (!LibraryUtils::findMangoHud().isEmpty()) m_capabilities |= SupportsMangoHud; #endif } @@ -1863,8 +1863,8 @@ void Application::updateCapabilities() void Application::detectLibraries() { #ifdef Q_OS_LINUX - m_detectedGLFWPath = MangoHud::findLibrary(BuildConfig.GLFW_LIBRARY_NAME); - m_detectedOpenALPath = MangoHud::findLibrary(BuildConfig.OPENAL_LIBRARY_NAME); + m_detectedGLFWPath = LibraryUtils::find(BuildConfig.GLFW_LIBRARY_NAME); + m_detectedOpenALPath = LibraryUtils::find(BuildConfig.OPENAL_LIBRARY_NAME); qDebug() << "Detected native libraries:" << m_detectedGLFWPath << m_detectedOpenALPath; #endif } diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 6588c0a81..2b43a904a 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -107,9 +107,9 @@ if (UNIX AND NOT CYGWIN AND NOT APPLE) set(CORE_SOURCES ${CORE_SOURCES} - # MangoHud - MangoHud.h - MangoHud.cpp + # LibraryUtils + LibraryUtils.h + LibraryUtils.cpp ) endif() diff --git a/launcher/MangoHud.cpp b/launcher/LibraryUtils.cpp similarity index 94% rename from launcher/MangoHud.cpp rename to launcher/LibraryUtils.cpp index d85100207..4ac038114 100644 --- a/launcher/MangoHud.cpp +++ b/launcher/LibraryUtils.cpp @@ -25,7 +25,7 @@ #include "FileSystem.h" #include "Json.h" -#include "MangoHud.h" +#include "LibraryUtils.h" #ifdef __GLIBC__ #ifndef _GNU_SOURCE @@ -36,9 +36,9 @@ #include #endif -namespace MangoHud { +namespace LibraryUtils { -QString getLibraryString() +QString findMangoHud() { /** * Guess MangoHud install location by searching for vulkan layers in this order: @@ -123,7 +123,7 @@ QString getLibraryString() #ifdef __GLIBC__ // Check whether mangohud is usable on a glibc based system - QString libraryPath = findLibrary(libraryName); + QString libraryPath = find(libraryName); if (!libraryPath.isEmpty()) { return libraryPath; } @@ -138,7 +138,7 @@ QString getLibraryString() return {}; } -QString findLibrary(QString libName) +QString find(QString libName) { #ifdef __GLIBC__ const char* library = libName.toLocal8Bit().constData(); @@ -161,11 +161,11 @@ QString findLibrary(QString libName) dlclose(handle); return fullPath; #else - qWarning() << "MangoHud::findLibrary is not implemented on this platform"; + qWarning() << "LibraryUtils::find is not implemented on this platform"; return {}; #endif } -} // namespace MangoHud +} // namespace LibraryUtils #ifdef UNDEF_GNU_SOURCE #undef _GNU_SOURCE diff --git a/launcher/MangoHud.h b/launcher/LibraryUtils.h similarity index 87% rename from launcher/MangoHud.h rename to launcher/LibraryUtils.h index 5361999b4..6832a9627 100644 --- a/launcher/MangoHud.h +++ b/launcher/LibraryUtils.h @@ -21,9 +21,9 @@ #include #include -namespace MangoHud { +namespace LibraryUtils { -QString getLibraryString(); +QString findMangoHud(); -QString findLibrary(QString libName); -} // namespace MangoHud +QString find(QString libName); +} // namespace LibraryUtils diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 1573a1aea..ee428e654 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -97,7 +97,7 @@ #include #ifdef Q_OS_LINUX -#include "MangoHud.h" +#include "LibraryUtils.h" #endif #ifdef WITH_QTDBUS @@ -700,7 +700,7 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment() if (auto value = env.value("LD_PRELOAD"); !value.isEmpty()) preloadList = value.split(QLatin1String(":")); - auto mangoHudLibString = MangoHud::getLibraryString(); + auto mangoHudLibString = LibraryUtils::findMangoHud(); if (!mangoHudLibString.isEmpty()) { QFileInfo mangoHudLib(mangoHudLibString); QString libPath = mangoHudLib.absolutePath();