claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ROM search path code to rom.c, rewrite rom_fopen

Browse Source
This commit is contained in:
David Hrdlička
2022-04-08 00:46:30 +02:00
parent a780d9a241
commit 3449a173ae
6 changed files with 71 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/unix/unix.c
View File

@@ -766,7 +766,7 @@ plat_init_rom_paths()
if (!plat_dir_check(xdg_rom_path))
plat_dir_create(xdg_rom_path);
add_rom_path(xdg_rom_path);
rom_add_path(xdg_rom_path);
} else {
char home_rom_path[1024] = { 0 };
snprintf(home_rom_path, 1024, "%s/.local/share/86Box/", getenv("HOME") ? getenv("HOME") : getpwuid(getuid())->pw_dir);
@@ -777,7 +777,7 @@ plat_init_rom_paths()
if (!plat_dir_check(home_rom_path))
plat_dir_create(home_rom_path);
add_rom_path(home_rom_path);
rom_add_path(home_rom_path);
}
if (getenv("XDG_DATA_DIRS")) {
char* xdg_rom_paths = strdup(getenv("XDG_DATA_DIRS"));
@@ -792,18 +792,18 @@ plat_init_rom_paths()
strcat(real_xdg_rom_path, cur_xdg_rom_path);
plat_path_slash(real_xdg_rom_path);
strcat(real_xdg_rom_path, "86Box/roms/");
add_rom_path(real_xdg_rom_path);
rom_add_path(real_xdg_rom_path);
}
}
free(xdg_rom_paths_orig);
} else {
add_rom_path("/usr/local/share/86Box/roms/");
add_rom_path("/usr/share/86Box/roms/");
rom_add_path("/usr/local/share/86Box/roms/");
rom_add_path("/usr/share/86Box/roms/");
}
#else
char default_rom_path[1024] = { '\0 '};
getDefaultROMPath(default_rom_path);
add_rom_path(default_rom_path);
rom_path_add(default_rom_path);
#endif
}