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 no-assets feature to common

Browse Source
This commit is contained in:
Joshua Barretto 2020-01-27 22:41:30 +00:00
parent 56a553c968
commit e391d6e4fd
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/Cargo.toml
View File

@ -5,7 +5,7 @@ authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
common = { package = "veloren-common", path = "../common" } common = { package = "veloren-common", path = "../common", features = ["no-assets"] }
byteorder = "1.3.2" byteorder = "1.3.2"
uvth = "3.1.1" uvth = "3.1.1"

3
common/Cargo.toml
View File

@ -4,6 +4,9 @@ version = "0.4.0"
authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Maciej Ćwięka <mckol363@gmail.com>", "Imbris <imbrisf@gmail.com>"] authors = ["Joshua Barretto <joshua.s.barretto@gmail.com>", "Maciej Ćwięka <mckol363@gmail.com>", "Imbris <imbrisf@gmail.com>"]
edition = "2018" edition = "2018"
[features]
no-assets = []
[dependencies] [dependencies]
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" }

2
common/build.rs
View File

@ -36,7 +36,7 @@ fn main() {
Err(e) => panic!("failed to retrieve current git commit hash: {}", e), Err(e) => panic!("failed to retrieve current git commit hash: {}", e),
} }
// Check if git-lfs is working // Check if git-lfs is working
if std::env::var("DISABLE_GIT_LFS_CHECK").is_err() { if std::env::var("DISABLE_GIT_LFS_CHECK").is_err() || cfg!(not(feature = "no-assets")) {
let asset_path: PathBuf = ["..", "assets", "voxygen", "background", "bg_main.png"] let asset_path: PathBuf = ["..", "assets", "voxygen", "background", "bg_main.png"]
.iter() .iter()
.collect(); .collect();