Merge remote-tracking branch 'upstream/develop' into upstream_update

2021-12-31 18:05:40 +01:00
parent 0c177b1086 9579231ccc
commit fa98ed3ccd
53 changed files with 268 additions and 163 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_"))
        {