feat: add custom native library path settings

Scrumplex · Scrumplex · commit 83aa0062c7d8 · 2023-08-15T10:51:21.000+02:00
Signed-off-by: Sefa Eyeoglu &lt;contact@scrumplex.net&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -216,6 +216,18 @@ set(Launcher_SUBREDDIT_URL "https://prismlauncher.org/reddit" CACHE STRING "URL
 set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules")
 set(Launcher_QT_VERSION_MAJOR "6" CACHE STRING "Major Qt version to build against")
 
+# Native libraries
+if(UNIX AND APPLE)
+    set(Launcher_GLFW_LIBRARY_NAME "libglfw.dylib" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "libopenal.dylib" CACHE STRING "Name of native glfw library")
+elseif(UNIX)
+    set(Launcher_GLFW_LIBRARY_NAME "libglfw.so" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "libopenal.so" CACHE STRING "Name of native glfw library")
+elseif(WIN32)
+    set(Launcher_GLFW_LIBRARY_NAME "glfw.dll" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "OpenAL.dll" CACHE STRING "Name of native glfw library")
+endif()
+
 # API Keys
 # NOTE: These API keys are here for convenience. If you rebrand this software or intend to break the terms of service
 # of these platforms, please change these API keys beforehand.
diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
@@ -110,6 +110,9 @@ Config::Config()
     FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
     META_URL = "@Launcher_META_URL@";
 
+    GLFW_LIBRARY_NAME = "@Launcher_GLFW_LIBRARY_NAME@";
+    OPENAL_LIBRARY_NAME = "@Launcher_OPENAL_LIBRARY_NAME@";
+
     BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";
     TRANSLATIONS_URL = "@Launcher_TRANSLATIONS_URL@";
     MATRIX_URL = "@Launcher_MATRIX_URL@";
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
@@ -134,6 +134,9 @@ class Config {
      */
     QString META_URL;
 
+    QString GLFW_LIBRARY_NAME;
+    QString OPENAL_LIBRARY_NAME;
+
     QString BUG_TRACKER_URL;
     QString TRANSLATIONS_URL;
     QString MATRIX_URL;
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
@@ -582,7 +582,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
         // Native library workarounds
         m_settings->registerSetting("UseNativeOpenAL", false);
+        m_settings->registerSetting("CustomOpenALPath", "");
         m_settings->registerSetting("UseNativeGLFW", false);
+        m_settings->registerSetting("CustomGLFWPath", "");
 
         // Peformance related options
         m_settings->registerSetting("EnableFeralGamemode", false);
@@ -842,6 +844,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
     updateCapabilities();
 
+    detectLibraries();
+
     if (createSetupWizard()) {
         return;
     }
@@ -1412,6 +1416,15 @@ void Application::updateCapabilities()
 #endif
 }
 
+void Application::detectLibraries()
+{
+#ifdef Q_OS_LINUX
+    m_detectedGLFWPath = MangoHud::findLibrary(BuildConfig.GLFW_LIBRARY_NAME);
+    m_detectedOpenALPath = MangoHud::findLibrary(BuildConfig.OPENAL_LIBRARY_NAME);
+    qDebug() << m_detectedGLFWPath << m_detectedOpenALPath;
+#endif
+}
+
 QString Application::getJarPath(QString jarFile)
 {
     QStringList potentialPaths = {
diff --git a/launcher/Application.h b/launcher/Application.h
@@ -142,6 +142,8 @@ class Application : public QApplication {
 
     void updateCapabilities();
 
+    void detectLibraries();
+
     /*!
      * Finds and returns the full path to a jar file.
      * Returns a null-string if it could not be found.
@@ -275,6 +277,8 @@ class Application : public QApplication {
     SetupWizard* m_setupWizard = nullptr;
 
    public:
+    QString m_detectedGLFWPath;
+    QString m_detectedOpenALPath;
     QString m_instanceIdToLaunch;
     QString m_serverToJoin;
     QString m_profileToUse;
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
@@ -166,7 +166,9 @@ void MinecraftInstance::loadSpecificSettings()
         // Native library workarounds
         auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
         m_settings->registerOverride(global_settings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
+        m_settings->registerOverride(global_settings->getSetting("CustomOpenALPath"), nativeLibraryWorkaroundsOverride);
         m_settings->registerOverride(global_settings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
+        m_settings->registerOverride(global_settings->getSetting("CustomGLFWPath"), nativeLibraryWorkaroundsOverride);
 
         // Peformance related options
         auto performanceOverride = m_settings->registerSetting("OverridePerformance", false);
@@ -390,22 +392,28 @@ QStringList MinecraftInstance::extraArguments()
             list.append("-Dloader.disable_beacon=true");
     }
 
-#ifdef Q_OS_LINUX
     {
         QString openALPath;
         QString glfwPath;
 
-        if (settings()->get("UseNativeOpenAL").toBool())
-            openALPath = MangoHud::findLibrary("libopenal.so");
-        if (settings()->get("UseNativeGLFW").toBool())
-            glfwPath = MangoHud::findLibrary("libglfw.so");
+        if (settings()->get("UseNativeOpenAL").toBool()) {
+            auto customPath = settings()->get("CustomOpenALPath").toString();
+            openALPath = APPLICATION->m_detectedOpenALPath;
+            if (!customPath.isEmpty())
+                openALPath = customPath;
+        }
+        if (settings()->get("UseNativeGLFW").toBool()) {
+            auto customPath = settings()->get("CustomGLFWPath").toString();
+            glfwPath = APPLICATION->m_detectedGLFWPath;
+            if (!customPath.isEmpty())
+                glfwPath = customPath;
+        }
 
         if (!openALPath.isEmpty())
             list.append("-Dorg.lwjgl.openal.libname=" + openALPath);
         if (!glfwPath.isEmpty())
             list.append("-Dorg.lwjgl.glfw.libname=" + glfwPath);
     }
-#endif
 
     return list;
 }
diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp
@@ -35,6 +35,7 @@
  */
 
 #include "MinecraftPage.h"
+#include "BuildConfig.h"
 #include "ui_MinecraftPage.h"
 
 #include <QDir>
@@ -44,9 +45,15 @@
 #include "Application.h"
 #include "settings/SettingsObject.h"
 
+#ifdef Q_OS_LINUX
+#include "MangoHud.h"
+#endif
+
 MinecraftPage::MinecraftPage(QWidget* parent) : QWidget(parent), ui(new Ui::MinecraftPage)
 {
     ui->setupUi(this);
+    connect(ui->useNativeGLFWCheck, &QAbstractButton::toggled, this, &MinecraftPage::onUseNativeGLFWChanged);
+    connect(ui->useNativeOpenALCheck, &QAbstractButton::toggled, this, &MinecraftPage::onUseNativeOpenALChanged);
     loadSettings();
     updateCheckboxStuff();
 }
@@ -74,6 +81,16 @@ void MinecraftPage::on_maximizedCheckBox_clicked(bool checked)
     updateCheckboxStuff();
 }
 
+void MinecraftPage::onUseNativeGLFWChanged(bool checked)
+{
+    ui->lineEditGLFWPath->setEnabled(checked);
+}
+
+void MinecraftPage::onUseNativeOpenALChanged(bool checked)
+{
+    ui->lineEditOpenALPath->setEnabled(checked);
+}
+
 void MinecraftPage::applySettings()
 {
     auto s = APPLICATION->settings();
@@ -84,8 +101,10 @@ void MinecraftPage::applySettings()
     s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
 
     // Native library workarounds
-    s->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
     s->set("UseNativeGLFW", ui->useNativeGLFWCheck->isChecked());
+    s->set("CustomGLFWPath", ui->lineEditGLFWPath->text());
+    s->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
+    s->set("CustomOpenALPath", ui->lineEditOpenALPath->text());
 
     // Peformance related options
     s->set("EnableFeralGamemode", ui->enableFeralGamemodeCheck->isChecked());
@@ -114,8 +133,20 @@ void MinecraftPage::loadSettings()
     ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
     ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
 
-    ui->useNativeOpenALCheck->setChecked(s->get("UseNativeOpenAL").toBool());
     ui->useNativeGLFWCheck->setChecked(s->get("UseNativeGLFW").toBool());
+    ui->lineEditGLFWPath->setText(s->get("CustomGLFWPath").toString());
+    ui->lineEditGLFWPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.GLFW_LIBRARY_NAME));
+#ifdef Q_OS_LINUX
+    if (!APPLICATION->m_detectedGLFWPath.isEmpty())
+        ui->lineEditGLFWPath->setPlaceholderText(tr("Auto detected path: %1").arg(APPLICATION->m_detectedGLFWPath));
+#endif
+    ui->useNativeOpenALCheck->setChecked(s->get("UseNativeOpenAL").toBool());
+    ui->lineEditOpenALPath->setText(s->get("CustomOpenALPath").toString());
+    ui->lineEditOpenALPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.OPENAL_LIBRARY_NAME));
+#ifdef Q_OS_LINUX
+    if (!APPLICATION->m_detectedOpenALPath.isEmpty())
+        ui->lineEditOpenALPath->setPlaceholderText(tr("Auto detected path: %1").arg(APPLICATION->m_detectedOpenALPath));
+#endif
 
     ui->enableFeralGamemodeCheck->setChecked(s->get("EnableFeralGamemode").toBool());
     ui->enableMangoHud->setChecked(s->get("EnableMangoHud").toBool());
diff --git a/launcher/ui/pages/global/MinecraftPage.h b/launcher/ui/pages/global/MinecraftPage.h
@@ -70,6 +70,9 @@ class MinecraftPage : public QWidget, public BasePage {
    private slots:
     void on_maximizedCheckBox_clicked(bool checked);
 
+    void onUseNativeGLFWChanged(bool checked);
+    void onUseNativeOpenALChanged(bool checked);
+
    private:
     Ui::MinecraftPage* ui;
 };
diff --git a/launcher/ui/pages/global/MinecraftPage.ui b/launcher/ui/pages/global/MinecraftPage.ui
@@ -214,21 +214,55 @@
          <property name="title">
           <string>Native library workarounds</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_11">
-          <item>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
            <widget class="QCheckBox" name="useNativeGLFWCheck">
             <property name="text">
              <string>Use system installation of &amp;GLFW</string>
             </property>
            </widget>
           </item>
-          <item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelGLFWPath">
+            <property name="text">
+             <string>&amp;GLFW library path</string>
+            </property>
+            <property name="buddy">
+             <cstring>lineEditGLFWPath</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
            <widget class="QCheckBox" name="useNativeOpenALCheck">
             <property name="text">
              <string>Use system installation of &amp;OpenAL</string>
             </property>
            </widget>
           </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="labelOpenALPath">
+            <property name="text">
+             <string>&amp;OpenAL library path</string>
+            </property>
+            <property name="buddy">
+             <cstring>lineEditOpenALPath</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="lineEditGLFWPath">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="lineEditOpenALPath">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -66,6 +66,10 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance* inst, QWidget* parent)
     connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
     connect(ui->instanceAccountSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &InstanceSettingsPage::changeInstanceAccount);
+
+    connect(ui->useNativeGLFWCheck, &QAbstractButton::toggled, this, &InstanceSettingsPage::onUseNativeGLFWChanged);
+    connect(ui->useNativeOpenALCheck, &QAbstractButton::toggled, this, &InstanceSettingsPage::onUseNativeOpenALChanged);
+
     loadSettings();
 
     updateThresholds();
@@ -198,11 +202,15 @@ void InstanceSettingsPage::applySettings()
     bool workarounds = ui->nativeWorkaroundsGroupBox->isChecked();
     m_settings->set("OverrideNativeWorkarounds", workarounds);
     if (workarounds) {
-        m_settings->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
         m_settings->set("UseNativeGLFW", ui->useNativeGLFWCheck->isChecked());
+        m_settings->set("CustomGLFWPath", ui->lineEditGLFWPath->text());
+        m_settings->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
+        m_settings->set("CustomOpenALPath", ui->lineEditOpenALPath->text());
     } else {
-        m_settings->reset("UseNativeOpenAL");
         m_settings->reset("UseNativeGLFW");
+        m_settings->reset("CustomGLFWPath");
+        m_settings->reset("UseNativeOpenAL");
+        m_settings->reset("CustomOpenALPath");
     }
 
     // Performance
@@ -312,7 +320,19 @@ void InstanceSettingsPage::loadSettings()
     // Workarounds
     ui->nativeWorkaroundsGroupBox->setChecked(m_settings->get("OverrideNativeWorkarounds").toBool());
     ui->useNativeGLFWCheck->setChecked(m_settings->get("UseNativeGLFW").toBool());
+    ui->lineEditGLFWPath->setText(m_settings->get("CustomGLFWPath").toString());
+#ifdef Q_OS_LINUX
+    ui->lineEditGLFWPath->setPlaceholderText(APPLICATION->m_detectedGLFWPath);
+#else
+    ui->lineEditGLFWPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.GLFW_LIBRARY_NAME));
+#endif
     ui->useNativeOpenALCheck->setChecked(m_settings->get("UseNativeOpenAL").toBool());
+    ui->lineEditOpenALPath->setText(m_settings->get("CustomOpenALPath").toString());
+#ifdef Q_OS_LINUX
+    ui->lineEditOpenALPath->setPlaceholderText(APPLICATION->m_detectedOpenALPath);
+#else
+    ui->lineEditGLFWPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.OPENAL_LIBRARY_NAME));
+#endif
 
     // Performance
     ui->perfomanceGroupBox->setChecked(m_settings->get("OverridePerformance").toBool());
@@ -408,6 +428,16 @@ void InstanceSettingsPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
+void InstanceSettingsPage::onUseNativeGLFWChanged(bool checked)
+{
+    ui->lineEditGLFWPath->setEnabled(checked);
+}
+
+void InstanceSettingsPage::onUseNativeOpenALChanged(bool checked)
+{
+    ui->lineEditOpenALPath->setEnabled(checked);
+}
+
 void InstanceSettingsPage::updateAccountsMenu()
 {
     ui->instanceAccountSelector->clear();
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -71,6 +71,9 @@ class InstanceSettingsPage : public QWidget, public BasePage {
     void on_javaBrowseBtn_clicked();
     void on_maxMemSpinBox_valueChanged(int i);
 
+    void onUseNativeGLFWChanged(bool checked);
+    void onUseNativeOpenALChanged(bool checked);
+
     void applySettings();
     void loadSettings();
 
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui
