Skip to content

Commit

Permalink
Auto merge of #200 - jdm:uwp-rustc-with-cpp-changes, r=asajeffrey
Browse files Browse the repository at this point in the history
Add cargo feature to build with UWP support.

These changes remove a bunch of forbidden API uses. I've tested a local build and it starts up and can successfully JIT some rAF code in a WebGL example.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/200)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Sep 11, 2019
2 parents d874462 + 9ad6d4b commit 99952b4
Show file tree
Hide file tree
Showing 23 changed files with 814 additions and 10 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Expand Up @@ -18,6 +18,7 @@ exclude = [
[features]
debugmozjs = []
profilemozjs = []
uwp = []

[lib]
name = "mozjs_sys"
Expand Down
3 changes: 3 additions & 0 deletions build.rs
Expand Up @@ -120,6 +120,9 @@ fn build_jsapi() {
if target.contains("gnu") {
println!("cargo:rustc-link-lib=stdc++");
}
if cfg!(feature = "uwp") {
println!("cargo:rustc-link-lib=mincore");
}
} else if target.contains("apple") || target.contains("freebsd") {
println!("cargo:rustc-link-lib=c++");
} else {
Expand Down

0 comments on commit 99952b4

Please sign in to comment.