Merge branch 'master' into web
This commit is contained in:
commit
0a93be78b8
4 changed files with 4 additions and 2 deletions
2
.github/workflows/integration.yml
vendored
2
.github/workflows/integration.yml
vendored
|
|
@ -1,5 +1,5 @@
|
|||
name: Integration
|
||||
on: [push]
|
||||
on: [push, pull_request]
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ matrix:
|
|||
allow_failures:
|
||||
- rust: nightly
|
||||
fast_finish: true
|
||||
cache: cargo
|
||||
before_install:
|
||||
- |
|
||||
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue