Merge remote-tracking branch 'upstream/develop' into upstream_update
This commit is contained in:
BUILD.mdCMakeLists.txt
launcher
Application.cppDesktopServices.cppFileSystem.cppInstanceImportTask.cppLaunchController.cppUpdateController.cppVersion.cpp
java
meta
minecraft
modplatform
atlauncher
flame
legacy_ftb
modpacksch
technic
net
news
notifications
tools
translations
ui
dialogs
pages
instance
modplatform
atlauncher
flame
ftb
legacy_ftb
technic
widgets
updater
libraries
@ -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_"))
|
||||
{
|
||||
|
Reference in New Issue
Block a user