Merge pull request #4345 from graemeg/freebsd-support

Adds FreeBSD support to MultiMC
This commit is contained in:
Petr Mrázek 2021-12-30 20:00:45 +01:00 committed by GitHub
commit 3efcccf334
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 96 additions and 19 deletions

View file

@ -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_"))
{