Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WebAssembly compile stub #1

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

WebAssembly compile stub #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
903059f
Conditionalize shared_library dependency, only used for *nix platforms
iceiix Mar 2, 2019
d9c7f0e
Change winit dependency to onthreadcb branch
iceiix Mar 2, 2019
2915777
Update winit to tomaka master
iceiix Mar 2, 2019
02f2a55
Update to wasm_stub winit branch https://github.com/iceiix/winit/pull/2
iceiix Mar 2, 2019
9307ef7
Copy src/platform/wasm32/mod.rs from src/platform/emscripten/mod.rs
iceiix Mar 2, 2019
bb8ce24
Strip down wasm32 target
iceiix Mar 2, 2019
9779735
lazy_static is used on Windows for EGL
iceiix Mar 3, 2019
4f8791c
lazy_static is used on Windows for EGL
iceiix Mar 3, 2019
a3c09bb
lazy_static is also used on Android
iceiix Mar 3, 2019
83ad93c
lazy_static is also used on Android
iceiix Mar 3, 2019
e142b29
Merge branch 'master' into shared_library
iceiix Mar 3, 2019
3fa7bc5
Merge branch 'shared_library' into wasm_stub
iceiix Mar 3, 2019
de52fba
Update wasm stub for Rust 2018
iceiix Mar 3, 2019
5f490a9
Merge branch 'master' into wasm_stub
iceiix May 19, 2019
43c1661
Update to v0.19.0 updated wasm_stub
iceiix May 19, 2019
3d99564
Compile lib.rs on wasm32
iceiix May 20, 2019
e73b6bd
Remove wasm32 module in favor of blank
iceiix May 20, 2019
c92b2bf
Allow warnings
iceiix May 20, 2019
5ff18de
Use the default 'blank' module instead of custom wasm32 stubs
iceiix May 20, 2019
67016a0
Update winit in examples directory to wasm_stub branch as well
iceiix May 23, 2019
1e48d32
Key on arch (wasm32) instead of os to encompass both wasi/unknown
iceiix May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion glutin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ serde = ["winit/serde"]

[dependencies]
lazy_static = "1.3"
winit = "^0.19.1"
#winit = "^0.19.1"
#winit = { git = "https://github.com/iceiix/winit", branch = "wasm_stub" }
winit = { git = "https://github.com/iceiix/winit", rev = "0e0ebeb34656dda53e0961638521b18a24254b78" }

[target.'cfg(target_os = "android")'.dependencies]
android_glue = "0.2"
Expand Down
3 changes: 2 additions & 1 deletion glutin/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@
target_os = "netbsd",
target_os = "openbsd",
target_os = "emscripten",
target_arch = "wasm32",
))]
#![deny(
warnings,
//warnings,
missing_debug_implementations,
//missing_docs,
)]
Expand Down
2 changes: 1 addition & 1 deletion glutin_examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ publish = false

[dependencies]
glutin = { path = "../glutin" }
winit = "0.19"
winit = { git = "https://github.com/iceiix/winit", rev = "0e0ebeb34656dda53e0961638521b18a24254b78" }
takeable-option = "0.4"
image = "0.21"

Expand Down