feat: implement override for GLFW/OpenAL with split natives

Fixes #513 Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
PrismLauncher · Jul 17, 2023 · bb28672 · bb28672
1 parent aaf1726
commit bb28672
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 9 deletions.
diff --git a/launcher/MangoHud.cpp b/launcher/MangoHud.cpp
@@ -16,15 +16,25 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <QStringList>
+#include <QDebug>
 #include <QDir>
 #include <QString>
+#include <QStringList>
 #include <QSysInfo>
 #include <QtGlobal>
 
-#include "MangoHud.h"
 #include "FileSystem.h"
 #include "Json.h"
+#include "MangoHud.h"
+
+#ifdef __GLIBC__
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#define UNDEF_GNU_SOURCE
+#endif
+#include <dlfcn.h>
+#include <linux/limits.h>
+#endif
 
 namespace MangoHud {
 
@@ -106,4 +116,37 @@ QString getLibraryString()
 
     return QString();
 }
+
+QString findLibrary(QString libName)
+{
+#ifdef __GLIBC__
+    const char* library = libName.toLocal8Bit().constData();
+
+    void* handle = dlopen(library, RTLD_NOW);
+    if (!handle) {
+        qCritical() << "dlopen() failed:" << dlerror();
+        return {};
+    }
+
+    char path[PATH_MAX];
+    if (dlinfo(handle, RTLD_DI_ORIGIN, path) == -1) {
+        qCritical() << "dlinfo() failed:" << dlerror();
+        dlclose(handle);
+        return {};
+    }
+
+    auto fullPath = FS::PathCombine(QString(path), libName);
+
+    dlclose(handle);
+    return fullPath;
+#else
+    qWarning() << "MangoHud::findLibrary is not implemented on this platform";
+    return {};
+#endif
+}
 }  // namespace MangoHud
+
+#ifdef UNDEF_GNU_SOURCE
+#undef _GNU_SOURCE
+#undef UNDEF_GNU_SOURCE
+#endif
diff --git a/launcher/MangoHud.h b/launcher/MangoHud.h
@@ -24,4 +24,6 @@
 namespace MangoHud {
 
 QString getLibraryString();
-}
+
+QString findLibrary(QString libName);
+}  // namespace MangoHud
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
@@ -399,6 +399,22 @@ QStringList MinecraftInstance::extraArguments()
     if (version->getModLoaders().value() & ResourceAPI::Quilt && settings()->get("DisableQuiltBeacon").toBool()) {
         list.append("-Dloader.disable_beacon=true");
     }
+
+    {
+        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 (!openALPath.isEmpty())
+            list.append("-Dorg.lwjgl.openal.libname=" + openALPath);
+        if (!glfwPath.isEmpty())
+            list.append("-Dorg.lwjgl.glfw.libname=" + glfwPath);
+    }
+
     return list;
 }
 

diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp
@@ -40,7 +40,7 @@ static QString replaceSuffix (QString target, const QString &suffix, const QStri
     return target + replacement;
 }
 
-static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibHack, bool nativeOpenAL, bool nativeGLFW)
+static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibHack, bool nativeOpenAL)
 {
     QuaZip zip(source);
     if(!zip.open(QuaZip::mdUnzip))
@@ -56,9 +56,6 @@ static bool unzipNatives(QString source, QString targetFolder, bool applyJnilibH
     {
         QString name = zip.getCurrentFileName();
         auto lowercase = name.toLower();
-        if (nativeGLFW && name.contains("glfw")) {
-            continue;
-        }
         if (nativeOpenAL && name.contains("openal")) {
             continue;
         }
@@ -91,15 +88,16 @@ void ExtractNatives::executeTask()
         return;
     }
     auto settings = minecraftInstance->settings();
+
+    // We only need OpenAL here, as modern versions of LWJGL (3+) are handled by JVM args, while older versions (2) didn't have GLFW
     bool nativeOpenAL = settings->get("UseNativeOpenAL").toBool();
-    bool nativeGLFW = settings->get("UseNativeGLFW").toBool();
 
     auto outputPath  = minecraftInstance->getNativePath();
     auto javaVersion = minecraftInstance->getJavaVersion();
     bool jniHackEnabled = javaVersion.major() >= 8;
     for(const auto &source: toExtract)
     {
-        if(!unzipNatives(source, outputPath, jniHackEnabled, nativeOpenAL, nativeGLFW))
+        if(!unzipNatives(source, outputPath, jniHackEnabled, nativeOpenAL))
         {
             const char *reason = QT_TR_NOOP("Couldn't extract native jar '%1' to destination '%2'");
             emit logLine(QString(reason).arg(source, outputPath), MessageLevel::Fatal);