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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
From 401bce4a69d773cbacc28df57004155204dbe707 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jan@cholasta.net>
Date: Tue, 25 Feb 2020 12:53:07 +0100
Subject: [PATCH] Fix file paths
---
src/common/audio/music/i_soundfont.cpp | 4 +---
src/common/platform/posix/sdl/i_main.cpp | 14 +-------------
src/gameconfigfile.cpp | 14 ++------------
3 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/src/common/audio/music/i_soundfont.cpp b/src/common/audio/music/i_soundfont.cpp
index a8b4e9fdf..911b8e308 100644
--- a/src/common/audio/music/i_soundfont.cpp
+++ b/src/common/audio/music/i_soundfont.cpp
@@ -232,9 +232,7 @@ FPatchSetReader::FPatchSetReader(const char *filename)
#ifndef _WIN32
mCaseSensitivePaths = true;
const char *paths[] = {
- "/usr/local/lib/timidity",
- "/etc/timidity",
- "/etc"
+ "/etc/timidity++"
};
#else
const char *paths[] = {
diff --git a/src/common/platform/posix/sdl/i_main.cpp b/src/common/platform/posix/sdl/i_main.cpp
index 7fc179a51..f39a38440 100644
--- a/src/common/platform/posix/sdl/i_main.cpp
+++ b/src/common/platform/posix/sdl/i_main.cpp
@@ -129,19 +129,7 @@ int main (int argc, char **argv)
Args = new FArgs(argc, argv);
// Should we even be doing anything with progdir on Unix systems?
- char program[PATH_MAX];
- if (realpath (argv[0], program) == NULL)
- strcpy (program, argv[0]);
- char *slash = strrchr (program, '/');
- if (slash != NULL)
- {
- *(slash + 1) = '\0';
- progdir = program;
- }
- else
- {
- progdir = "./";
- }
+ progdir = "/usr/lib/gzdoom/";
I_StartupJoysticks();
diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
index 7f7e55a21..8dfd6a9b3 100644
--- a/src/gameconfigfile.cpp
+++ b/src/gameconfigfile.cpp
@@ -109,8 +109,6 @@ FGameConfigFile::FGameConfigFile ()
// Arch Linux likes them in /usr/share/doom
// Debian likes them in /usr/share/games/doom
// I assume other distributions don't do anything radically different
- SetValueForKey ("Path", "/usr/local/share/doom", true);
- SetValueForKey ("Path", "/usr/local/share/games/doom", true);
SetValueForKey ("Path", "/usr/share/doom", true);
SetValueForKey ("Path", "/usr/share/games/doom", true);
#endif
@@ -130,8 +128,6 @@ FGameConfigFile::FGameConfigFile ()
#else
SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
SetValueForKey ("Path", SHARE_DIR, true);
- SetValueForKey ("Path", "/usr/local/share/doom", true);
- SetValueForKey ("Path", "/usr/local/share/games/doom", true);
SetValueForKey ("Path", "/usr/share/doom", true);
SetValueForKey ("Path", "/usr/share/games/doom", true);
#endif
@@ -157,14 +153,8 @@ FGameConfigFile::FGameConfigFile ()
#else
SetValueForKey("Path", "$HOME/" GAME_DIR "/soundfonts", true);
SetValueForKey("Path", "$HOME/" GAME_DIR "/fm_banks", true);
- SetValueForKey("Path", "/usr/local/share/doom/soundfonts", true);
- SetValueForKey("Path", "/usr/local/share/doom/fm_banks", true);
- SetValueForKey("Path", "/usr/local/share/games/doom/soundfonts", true);
- SetValueForKey("Path", "/usr/local/share/games/doom/fm_banks", true);
- SetValueForKey("Path", "/usr/share/doom/soundfonts", true);
- SetValueForKey("Path", "/usr/share/doom/fm_banks", true);
- SetValueForKey("Path", "/usr/share/games/doom/soundfonts", true);
- SetValueForKey("Path", "/usr/share/games/doom/fm_banks", true);
+ SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/soundfonts", true);
+ SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/fm_banks", true);
#endif
}
--
2.27.0
|