Skip to content

Commit

Permalink
Add uwp targets (#1416)
Browse files Browse the repository at this point in the history 
* add uwp targets

* fix gen toml
  • Loading branch information
@bdbai
bdbai committed Jan 4, 2022
1 parent de0d697 commit 6f04b5a
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 5 deletions.
15 changes: 15 additions & 0 deletions crates/libs/sys/Cargo.toml
View file
Expand Up @@ -16,18 +16,33 @@ all-features = true
[target.i686-pc-windows-msvc.dependencies]
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" }

[target.i686-uwp-windows-msvc.dependencies]
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" }

[target.x86_64-pc-windows-msvc.dependencies]
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" }

[target.x86_64-uwp-windows-msvc.dependencies]
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" }

[target.aarch64-pc-windows-msvc.dependencies]
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" }

[target.aarch64-uwp-windows-msvc.dependencies]
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" }

[target.i686-pc-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" }

[target.i686-uwp-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" }

[target.x86_64-pc-windows-gnu.dependencies]
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" }

[target.x86_64-uwp-windows-gnu.dependencies]
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" }

[features]
default = []
deprecated = []
Expand Down
15 changes: 15 additions & 0 deletions crates/libs/windows/Cargo.toml
View file
Expand Up @@ -17,18 +17,33 @@ targets = []
[target.i686-pc-windows-msvc.dependencies]
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" }

[target.i686-uwp-windows-msvc.dependencies]
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" }

[target.x86_64-pc-windows-msvc.dependencies]
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" }

[target.x86_64-uwp-windows-msvc.dependencies]
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" }

[target.aarch64-pc-windows-msvc.dependencies]
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" }

[target.aarch64-uwp-windows-msvc.dependencies]
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" }

[target.i686-pc-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" }

[target.i686-uwp-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" }

[target.x86_64-pc-windows-gnu.dependencies]
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" }

[target.x86_64-uwp-windows-gnu.dependencies]
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" }

[dependencies]
windows_macros = { path = "../macros", version = "0.29.0", optional = true }
windows_reader = { path = "../reader", version = "0.29.0", optional = true }
Expand Down
3 changes: 2 additions & 1 deletion crates/targets/aarch64_msvc/build.rs
View file
@@ -1,5 +1,6 @@
fn main() {
if std::env::var("TARGET").unwrap() != "aarch64-pc-windows-msvc" {
let target = std::env::var("TARGET").unwrap();
if target != "aarch64-pc-windows-msvc" && target != "aarch64-uwp-windows-msvc" {
return;
}

Expand Down
3 changes: 2 additions & 1 deletion crates/targets/i686_gnu/build.rs
View file
@@ -1,5 +1,6 @@
fn main() {
if std::env::var("TARGET").unwrap() != "i686-pc-windows-gnu" {
let target = std::env::var("TARGET").unwrap();
if target != "i686-pc-windows-gnu" && target != "i686-uwp-windows-gnu" {
return;
}

Expand Down
3 changes: 2 additions & 1 deletion crates/targets/i686_msvc/build.rs
View file
@@ -1,5 +1,6 @@
fn main() {
if std::env::var("TARGET").unwrap() != "i686-pc-windows-msvc" {
let target = std::env::var("TARGET").unwrap();
if target != "i686-pc-windows-msvc" && target != "i686-uwp-windows-msvc" {
return;
}

Expand Down
3 changes: 2 additions & 1 deletion crates/targets/x86_64_gnu/build.rs
View file
@@ -1,5 +1,6 @@
fn main() {
if std::env::var("TARGET").unwrap() != "x86_64-pc-windows-gnu" {
let target = std::env::var("TARGET").unwrap();
if target != "x86_64-pc-windows-gnu" && target != "x86_64-uwp-windows-gnu" {
return;
}

Expand Down
3 changes: 2 additions & 1 deletion crates/targets/x86_64_msvc/build.rs
View file
@@ -1,5 +1,6 @@
fn main() {
if std::env::var("TARGET").unwrap() != "x86_64-pc-windows-msvc" {
let target = std::env::var("TARGET").unwrap();
if target != "x86_64-pc-windows-msvc" && target != "x86_64-uwp-windows-msvc" {
return;
}

Expand Down
15 changes: 15 additions & 0 deletions crates/tools/api/src/main.rs
View file
Expand Up @@ -41,18 +41,33 @@ targets = []
[target.i686-pc-windows-msvc.dependencies]
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" }
[target.i686-uwp-windows-msvc.dependencies]
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" }
[target.x86_64-pc-windows-msvc.dependencies]
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" }
[target.x86_64-uwp-windows-msvc.dependencies]
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" }
[target.aarch64-pc-windows-msvc.dependencies]
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" }
[target.aarch64-uwp-windows-msvc.dependencies]
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" }
[target.i686-pc-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" }
[target.i686-uwp-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" }
[target.x86_64-pc-windows-gnu.dependencies]
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" }
[target.x86_64-uwp-windows-gnu.dependencies]
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" }
[dependencies]
windows_macros = { path = "../macros", version = "0.29.0", optional = true }
windows_reader = { path = "../reader", version = "0.29.0", optional = true }
Expand Down
15 changes: 15 additions & 0 deletions crates/tools/sys/src/main.rs
View file
Expand Up @@ -40,18 +40,33 @@ all-features = true
[target.i686-pc-windows-msvc.dependencies]
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" }
[target.i686-uwp-windows-msvc.dependencies]
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" }
[target.x86_64-pc-windows-msvc.dependencies]
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" }
[target.x86_64-uwp-windows-msvc.dependencies]
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" }
[target.aarch64-pc-windows-msvc.dependencies]
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" }
[target.aarch64-uwp-windows-msvc.dependencies]
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" }
[target.i686-pc-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" }
[target.i686-uwp-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" }
[target.x86_64-pc-windows-gnu.dependencies]
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" }
[target.x86_64-uwp-windows-gnu.dependencies]
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" }
[features]
default = []
deprecated = []
Expand Down

0 comments on commit 6f04b5a

Please sign in to comment.