Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added the standard linux asset path and an enviroment variable for configuring it

Browse Source 
The variable is VELOREN_ASSETS
This commit is contained in:
Mckol 2019-06-28 19:38:36 +02:00
parent 89fbc86eb5
commit 5ffa79d07d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/assets/mod.rs
View File

@ -118,7 +118,13 @@ fn try_open_with_path(name: &str) -> Option<File> {
let abs_path = std::env::current_dir().expect("No current directory?");
// TODO: don't do this?
// if it's stupid and it works..,
let platform_specific = "".to_string();
#[cfg(target_os = "linux")]
{
let platform_specific = "/usr/share/veloren/assets".to_string();
}
[
std::env::var("VELOREN_ASSETS").unwrap_or("".to_owned()),
"assets".to_string(),
"../assets".to_string(), /* optimizations */
"../../assets".to_string(),
@ -127,6 +133,7 @@ fn try_open_with_path(name: &str) -> Option<File> {
[env!("CARGO_MANIFEST_DIR"), "/../../assets"].concat(),
"../../../assets".to_string(),
[env!("CARGO_MANIFEST_DIR"), "/../../../assets"].concat(),
platform_specific,
]
.into_iter()
.map(|bp| {