Merge branch 'master' into web

This commit is contained in:
Héctor Ramón Jiménez 2019-09-21 13:51:03 +02:00
commit 0a93be78b8
4 changed files with 4 additions and 2 deletions

View file

@ -1,5 +1,5 @@
name: Integration
on: [push]
on: [push, pull_request]
jobs:
test:
runs-on: ${{ matrix.os }}

View file

@ -7,7 +7,6 @@ matrix:
allow_failures:
- rust: nightly
fast_finish: true
cache: cargo
before_install:
- |
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then

View file

@ -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" }

View file

@ -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 {