blob: 156841eaca0ef57fadbe688541f245095b34f458 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- launcher/java/JavaUtils.cpp.orig 2021-09-08 22:27:46 UTC
+++ 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_"))
{
@@ -112,7 +112,7 @@ QProcessEnvironment CleanEnviroment()
// qDebug() << "Env: " << key << value;
env.insert(key, value);
}
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
// HACK: Workaround for QTBUG42500
if(!env.contains("LD_LIBRARY_PATH"))
{
@@ -142,6 +142,8 @@ JavaInstallPtr JavaUtils::GetDefaultJava()
javaVersion->arch = "unknown";
#if defined(Q_OS_WIN32)
javaVersion->path = "javaw";
+#elif defined(Q_OS_FREEBSD)
+ javaVersion->path = "multimc-minecraft-runtime";
#else
javaVersion->path = "java";
#endif
|
