Merge pull request #4345 from graemeg/freebsd-support

Adds FreeBSD support to MultiMC
2021-12-30 20:00:45 +01:00
parent 5e909a4e85 f42c3a953c
commit 3efcccf334
15 changed files with 96 additions and 19 deletions
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@ -31,7 +31,7 @@ JavaUtils::JavaUtils()
 {
 }

-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
 {
    QDir mmcBin(QCoreApplication::applicationDirPath());
@ -83,7 +83,7 @@ QProcessEnvironment CleanEnviroment()
            qDebug() << "Env: ignoring" << key << value;
            continue;
        }
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
        // Do not pass LD_* variables to java. They were intended for MultiMC
        if(key.startsWith("LD_"))
        {