diff options
| author | LennyMcLennington <lenny@sneed.church> | 2022-02-12 03:30:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-12 03:30:24 +0000 |
| commit | 7d912726d0038d1e3308606f6bdfba84b19bfb00 (patch) | |
| tree | 2c06a925ecd62636bb4b7e7003a7942959002992 /launcher | |
| parent | e3c8eb062c48d09ec70b687319f0c3f2fc837883 (diff) | |
| parent | b2b4ab3f0ce0efdd2ee5524c3e0e754a815f4a48 (diff) | |
| download | PrismLauncher-7d912726d0038d1e3308606f6bdfba84b19bfb00.tar.gz PrismLauncher-7d912726d0038d1e3308606f6bdfba84b19bfb00.tar.bz2 PrismLauncher-7d912726d0038d1e3308606f6bdfba84b19bfb00.zip | |
Merge pull request #134 from glowiak/patch-2
OpenBSD support and slackware build instructions
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/UpdateController.cpp | 2 | ||||
| -rw-r--r-- | launcher/tools/MCEditTool.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/UpdateController.cpp b/launcher/UpdateController.cpp index f9b7d349..c02cd1e7 100644 --- a/launcher/UpdateController.cpp +++ b/launcher/UpdateController.cpp @@ -93,7 +93,7 @@ void UpdateController::installUpdates() qDebug() << "Installing updates."; #ifdef Q_OS_WIN QString finishCmd = QApplication::applicationFilePath(); -#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) +#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined (Q_OS_OPENBSD) QString finishCmd = FS::PathCombine(m_root, BuildConfig.LAUNCHER_NAME); #elif defined Q_OS_MAC QString finishCmd = QApplication::applicationFilePath(); diff --git a/launcher/tools/MCEditTool.cpp b/launcher/tools/MCEditTool.cpp index 21e1a3b0..2c1ec613 100644 --- a/launcher/tools/MCEditTool.cpp +++ b/launcher/tools/MCEditTool.cpp @@ -52,7 +52,7 @@ QString MCEditTool::getProgramPath() #else const QString mceditPath = path(); QDir mceditDir(mceditPath); -#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) if (mceditDir.exists("mcedit.sh")) { return mceditDir.absoluteFilePath("mcedit.sh"); |