Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
diff --git a/src/core/pathfinder/pathfinder.cpp b/src/core/pathfinder/pathfinder.cpp
|
|
index f277283a..454a8145 100644
|
|
--- a/src/core/pathfinder/pathfinder.cpp
|
|
+++ b/src/core/pathfinder/pathfinder.cpp
|
|
@@ -137,9 +137,7 @@ PathFinder PathFinder::genericPathFinder(const QStringList &suffixes)
|
|
<< DataPaths::programFilesDirectory(DataPaths::x64)
|
|
<< DataPaths::programFilesDirectory(DataPaths::x86);
|
|
#else
|
|
- paths << "/usr/bin" << "/usr/local/bin" << "/usr/share/bin"
|
|
- << "/usr/games/" << "/usr/local/games/"
|
|
- << "/usr/share/games/" << QCoreApplication::applicationDirPath() << ".";
|
|
+ paths << gDefaultDataPaths->workingDirectory() << ".";
|
|
#endif
|
|
QStringList pathsCopy(paths);
|
|
for (const QString &path : pathsCopy)
|
|
diff --git a/src/core/pathfinder/wadpathfinder.cpp b/src/core/pathfinder/wadpathfinder.cpp
|
|
index 07df0b64..6300542d 100644
|
|
--- a/src/core/pathfinder/wadpathfinder.cpp
|
|
+++ b/src/core/pathfinder/wadpathfinder.cpp
|
|
@@ -84,10 +84,6 @@ public:
|
|
QStringList defaultPaths()
|
|
{
|
|
QStringList paths;
|
|
- #ifdef Q_OS_UNIX
|
|
- paths << "/usr/local/share/games/doom/"
|
|
- << "/usr/share/games/doom/";
|
|
- #endif
|
|
return paths;
|
|
}
|
|
};
|