0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-Windows derp

Browse Source
This commit is contained in:
Sky 2013-10-15 00:30:33 +01:00
parent deffe7db43
commit 7aacf93c7c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
logic/JavaUtils.cpp
View File

@ -150,25 +150,34 @@ QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
return javas;
}
#elif OSX
std::vector<java_install> JavaUtils::FindJavaPaths()
QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
return this->GetDefaultJava();
QList<JavaVersionPtr> javas;
javas.append(this->GetDefaultJava());
return javas;
}
#elif LINUX
std::vector<java_install> JavaUtils::FindJavaPaths()
QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\"";
return this->GetDefaultJava();
QList<JavaVersionPtr> javas;
javas.append(this->GetDefaultJava());
return javas;
}
#else
std::vector<java_install> JavaUtils::FindJavaPaths()
QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "Unknown operating system build - defaulting to \"java\"";
return this->GetDefaultJava();
QList<JavaVersionPtr> javas;
javas.append(this->GetDefaultJava());
return javas;
}
#endif