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

Apply patches

Browse Source 
Re-add lin-system, and fix Linux datadir

fix jar paths

allow for modern java
This commit is contained in:
swirl
2021-12-17 12:52:13 -05:00
committed by Lenny McLennington
parent 7d047f9223
commit 7912e0f32b
4 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/Application.cpp
View File

@@ -308,7 +308,13 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
}
else
{
#if defined(Q_OS_MAC)
#ifdef LAUNCHER_LINUX_DATADIR
QString xdgDataHome = QFile::decodeName(qgetenv("XDG_DATA_HOME"));
if (xdgDataHome.isEmpty())
xdgDataHome = QDir::homePath() + QLatin1String("/.local/share");
dataPath = xdgDataHome + "/devlauncher";
adjustedBy += "XDG standard " + dataPath;
#elif defined(Q_OS_MAC)
QDir foo(FS::PathCombine(applicationDirPath(), "../../Data"));
dataPath = foo.absolutePath();
adjustedBy += "Fallback to special Mac location " + dataPath;
@@ -524,6 +530,10 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
FS::updateTimestamp(m_rootPath);
#endif
#ifdef MULTIMC_JARS_LOCATION
m_jarsPath = TOSTRING(MULTIMC_JARS_LOCATION);
#endif
qDebug() << BuildConfig.LAUNCHER_DISPLAYNAME << ", (c) 2013-2021 " << BuildConfig.LAUNCHER_COPYRIGHT;
qDebug() << "Version : " << BuildConfig.printableVersionString();
qDebug() << "Git commit : " << BuildConfig.GIT_COMMIT;