Resources path should use the same path as meson installed path

This commit is contained in:
dec05eba
2024-08-05 21:25:59 +02:00
parent 041ee753b1
commit ae1897cf2c
2 changed files with 13 additions and 5 deletions

View File

@@ -31,13 +31,16 @@ dep = [
mglpp_dep, mglpp_dep,
] ]
prefix = get_option('prefix')
datadir = get_option('datadir')
gsr_overlay_resources_path = join_paths(prefix, datadir, 'gsr-overlay')
executable( executable(
meson.project_name(), meson.project_name(),
src, src,
install : true, install : true,
dependencies : dep, dependencies : dep,
cpp_args : '-DGSR_OVERLAY_RESOURCES_PATH="' + gsr_overlay_resources_path + '"',
) )
prefix = get_option('prefix') install_subdir('images', install_dir : gsr_overlay_resources_path)
datadir = get_option('datadir')
install_subdir('images', install_dir : join_paths(prefix, datadir, 'gsr-overlay'))

View File

@@ -396,10 +396,15 @@ int main(int argc, char **argv) {
gsr::init_theme(gsr_info); gsr::init_theme(gsr_info);
std::string project_dir; std::string project_dir;
if(access("images/gpu_screen_recorder_logo.png", F_OK) == 0) if(access("images/gpu_screen_recorder_logo.png", F_OK) == 0) {
project_dir = "./"; project_dir = "./";
else } else {
#ifdef GSR_OVERLAY_RESOURCES_PATH
project_dir = GSR_OVERLAY_RESOURCES_PATH "/";
#else
project_dir = "/usr/share/gsr-overlay/"; project_dir = "/usr/share/gsr-overlay/";
#endif
}
mgl::Init init; mgl::Init init;
Display *display = (Display*)mgl_get_context()->connection; Display *display = (Display*)mgl_get_context()->connection;