Skip to content

Commit

Permalink
Update vulkano and shaderc deps to fix Linux build issues
Browse files Browse the repository at this point in the history
This fixes an issue where some Linux distros (Arch, Void, possibly
others) are unable to build 0.5.1. 0.6.1 includes the fix, hence the
update.

Merge pending freesig/shade_runner#21.
  • Loading branch information
mitchmindtree committed Aug 18, 2019
1 parent d66638d commit 1a50abd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Unreleased

- Update vulkano and shaderc dependencies to fix linux build issues.
- Add an example that demonstrates using the Draw API with multiple windows.
- Fix a bug where `Draw::to_frame` would `panic!` when used between multiple
windows.
Expand Down
15 changes: 8 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ default = ["notosans"]
[dependencies]
approx = "0.1"
cgmath = { version = "0.16", features = ["serde"] }
conrod_core = "0.66"
conrod_winit = "0.66"
conrod_vulkano = "0.66"
conrod_core = "0.67"
conrod_winit = "0.67"
conrod_vulkano = "0.67"
daggy = "0.6"
find_folder = "0.3"
image = "0.21"
Expand All @@ -32,9 +32,9 @@ serde = "1"
serde_derive = "1"
serde_json = "1"
toml = "0.4"
vulkano = "0.13"
vulkano-win = "0.13"
vulkano-shaders = "0.13"
vulkano = "0.14"
vulkano-win = "0.14"
vulkano-shaders = "0.14"
walkdir = "2"
winit = "0.19"

Expand All @@ -43,7 +43,8 @@ audrey = "0.2"
nannou_audio = "0.2"
nannou_laser = "0.3"
nannou_osc = "0.1"
shade_runner = "0.1"
shade_runner = { git = "https://github.com/mitchmindtree/shade_runner", branch = "update_vulkano" }
#shade_runner = "0.2"

[target.'cfg(target_os = "macos")'.dependencies]
moltenvk_deps = "0.1"
Expand Down

0 comments on commit 1a50abd

Please sign in to comment.