diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-12-30 20:00:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 20:00:45 +0100 |
| commit | 3efcccf334e28d03605dd0597f53f900105cf04b (patch) | |
| tree | ecafd89c7eb90d04f428c907da86c7d6b134c166 /launcher/java/JavaUtils.cpp | |
| parent | 5e909a4e852a5bf3ba9dec9081b4839773bfc0ce (diff) | |
| parent | f42c3a953c15b01632131435e4885f9acc3b1f1a (diff) | |
| download | PrismLauncher-3efcccf334e28d03605dd0597f53f900105cf04b.tar.gz PrismLauncher-3efcccf334e28d03605dd0597f53f900105cf04b.tar.bz2 PrismLauncher-3efcccf334e28d03605dd0597f53f900105cf04b.zip | |
Merge pull request #4345 from graemeg/freebsd-support
Adds FreeBSD support to MultiMC
Diffstat (limited to 'launcher/java/JavaUtils.cpp')
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index c844fb94..fd7e43e9 100644 --- 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_")) { |