From bced3cb6388485525d5b218bd17a33a0ae5dfad1 Mon Sep 17 00:00:00 2001 From: Songtronix Date: Wed, 2 Oct 2019 16:24:21 +0200 Subject: [PATCH] feat(voxygen): add logo for windows executable --- .gitattributes | 1 + Cargo.lock | 19 +++++++++++++++++++ assets/voxygen/logo.ico | 3 +++ voxygen/Cargo.toml | 3 +++ voxygen/build.rs | 10 ++++++++++ 5 files changed, 36 insertions(+) create mode 100644 assets/voxygen/logo.ico create mode 100644 voxygen/build.rs diff --git a/.gitattributes b/.gitattributes index 24824b82b4..d5a660767c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ *.ttf filter=lfs diff=lfs merge=lfs -text *.wav filter=lfs diff=lfs merge=lfs -text *.ogg filter=lfs diff=lfs merge=lfs -text +*.ico filter=lfs diff=lfs merge=lfs -text diff --git a/Cargo.lock b/Cargo.lock index 984e8161c4..da127c5743 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3498,6 +3498,14 @@ dependencies = [ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "toml" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "tuple_utils" version = "0.2.0" @@ -3746,6 +3754,7 @@ dependencies = [ "veloren-common 0.3.0", "veloren-server 0.3.0", "winit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3920,6 +3929,14 @@ dependencies = [ "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "winres" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ws2_32-sys" version = "0.2.1" @@ -4338,6 +4355,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20" +"checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724" "checksum tuple_utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbfecd7bb8f0a3e96b3b31c46af2677a55a588767c0091f484601424fcb20e7e" "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" @@ -4373,6 +4391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" "checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" "checksum winit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd67dc9e0f9e13da393d9b6fa13042f3aed9b2bb2db6717d72d4cc271970c415" +"checksum winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)" = "be65e1342a3baae65439cd03306778831a3d133b0d20243a7fb83fd5cf403c58" "checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/assets/voxygen/logo.ico b/assets/voxygen/logo.ico new file mode 100644 index 0000000000..0c9f338bcb --- /dev/null +++ b/assets/voxygen/logo.ico @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6269933d39242841d603060294a56f43faa573c8330549c75ff3ca5da3cf53d +size 66802 diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 32ca68a915..8c1944ee4f 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -63,3 +63,6 @@ crossbeam = "0.7.2" heaptrack = { version = "0.3.0", optional = true } hashbrown = { version = "0.5.0", features = ["serde", "nightly"] } chrono = "0.4.7" + +[target.'cfg(windows)'.build-dependencies] +winres = "0.1" \ No newline at end of file diff --git a/voxygen/build.rs b/voxygen/build.rs new file mode 100644 index 0000000000..5ceeba326a --- /dev/null +++ b/voxygen/build.rs @@ -0,0 +1,10 @@ +#[cfg(windows)] +fn main() { + //Set executable logo with winres here: + let mut res = winres::WindowsResource::new(); + res.set_icon("../assets/voxygen/logo.ico"); + res.compile().expect("failed to build executable logo."); +} + +#[cfg(not(windows))] +fn main() {}