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
|
diff --git a/meson.build b/meson.build
index 596d2b8..32d4254 100644
--- a/meson.build
+++ b/meson.build
@@ -490,7 +490,8 @@ if host_machine.system() != 'gba' and host_machine.system() != 'n3ds'
dependencies: dependencies,
link_args: link_args,
win_subsystem: 'windows',
- install_rpath: 'lib',
+ install_dir: 'lib/apotris',
+ install: true,
)
if host_machine.system() == 'darwin'
install_data('dist' / 'Apotris.icns', install_dir: 'Contents/Resources')
@@ -499,9 +500,8 @@ if host_machine.system() != 'gba' and host_machine.system() != 'n3ds'
install_subdir(audio_dir, install_dir: 'Contents/Resources')
install_subdir('license', install_dir: 'Contents/Resources')
else
- install_subdir(audio_dir, install_dir: '.')
- install_subdir(shaders_dir, install_dir: '.')
- install_subdir('license', install_dir: '.')
+ install_subdir(audio_dir, install_dir: 'share/apotris')
+ install_subdir(shaders_dir, install_dir: 'share/apotris/assets')
endif
endif
elif host_machine.system() == 'n3ds'
diff --git a/source/liba_window.cpp b/source/liba_window.cpp
index 76dcd79..30bd417 100644
--- a/source/liba_window.cpp
+++ b/source/liba_window.cpp
@@ -115,7 +115,7 @@ void windowInit() {
refreshWindowSize();
- loadAudio("");
+ loadAudio("/usr/share/apotris/");
nanotime_step_init(&stepper, (uint64_t)(NANOTIME_NSEC_PER_SEC / FPS_TARGET),
nanotime_now_max(), nanotime_now, nanotime_sleep);
diff --git a/source/shader.cpp b/source/shader.cpp
index 6b20065..23a550e 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -347,7 +347,7 @@ static bool hasSuffix(const std::string& s, const std::string& suffix) {
}
std::vector<std::string> findShaders() {
- std::string shaderPath = "assets/shaders";
+ std::string shaderPath = "/usr/share/apotris/assets/shaders";
DIR* dir = opendir(shaderPath.c_str());
if (!dir) {
|