summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-09-21 13:51:03 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-09-21 13:51:03 +0200
commit0a93be78b8405f57ea020c5ade8ebf52ce10a461 (patch)
treec1a3221c26d696ea4ea93b82a6badf2ff307dfa7 /examples
parent05889ecea82365b2af812a2902f1722660235259 (diff)
parentbb5cac49d028eb53c259ae58e3a007ebfb736fd4 (diff)
downloadiced-0a93be78b8405f57ea020c5ade8ebf52ce10a461.tar.gz
iced-0a93be78b8405f57ea020c5ade8ebf52ce10a461.tar.bz2
iced-0a93be78b8405f57ea020c5ade8ebf52ce10a461.zip
Merge branch 'master' into web
Diffstat (limited to 'examples')
-rw-r--r--examples/tour/Cargo.toml1
-rw-r--r--examples/tour/src/main.rs2
2 files changed, 3 insertions, 0 deletions
diff --git a/examples/tour/Cargo.toml b/examples/tour/Cargo.toml
index 8cdce295..2c79cbf7 100644
--- a/examples/tour/Cargo.toml
+++ b/examples/tour/Cargo.toml
@@ -23,6 +23,7 @@ iced_native = { version = "0.1.0-alpha", path = "../../native" }
# A personal `ggez` fork that introduces a `FontCache` type to measure text
# efficiently and fixes HiDPI issues.
ggez = { version = "0.5", git = "https://github.com/hecrj/ggez.git" }
+env_logger = "0.6"
[target.'cfg(target_arch = "wasm32")'.dependencies]
iced_web = { path = "../../web" }
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 72774d38..a34d3298 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -7,6 +7,8 @@ use ggez::graphics;
use ggez::input::mouse;
pub fn main() -> ggez::GameResult {
+ env_logger::init();
+
let (context, event_loop) = {
&mut ggez::ContextBuilder::new("iced", "ggez")
.window_mode(ggez::conf::WindowMode {