summarylogtreecommitdiffstats
path: root/030-m64p-fix-paths.patch
blob: d912a53ae7ba380c5a7e8ea057ee22cfa25ca569 (plain)
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
--- a/mupen64plus-gui/mainwindow.cpp
+++ b/mupen64plus-gui/mainwindow.cpp
@@ -4,6 +4,7 @@
 #include <QCloseEvent>
 #include <QActionGroup>
 #include <QDesktopServices>
+#include <QStandardPaths>
 #include "settingsdialog.h"
 #include "plugindialog.h"
 #include "mainwindow.h"
@@ -407,11 +408,11 @@ MainWindow::MainWindow(QWidget *parent) :
     updatePIF(ui);
 
     if (!settings->contains("coreLibPath"))
-        settings->setValue("coreLibPath", "$APP_PATH$");
+        settings->setValue("coreLibPath", "/usr/lib");
     if (!settings->contains("pluginDirPath"))
-        settings->setValue("pluginDirPath", "$APP_PATH$");
+        settings->setValue("pluginDirPath", "/usr/lib/mupen64plus");
     if (!settings->contains("configDirPath"))
-        settings->setValue("configDirPath", "$CONFIG_PATH$");
+        settings->setValue("configDirPath", QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/mupen64plus");
 
     updatePlugins();
 
@@ -512,7 +513,7 @@ void MainWindow::setupLLE()
 
 void MainWindow::setupDiscord()
 {
-    QLibrary *discordLib = new QLibrary((QDir(QCoreApplication::applicationDirPath()).filePath("discord_game_sdk")), this);
+    QLibrary *discordLib = new QLibrary("/usr/lib/discord_game_sdk", this);
 
     memset(&discord_app, 0, sizeof(discord_app));