alex/gb-emu
1
0
Fork 0
Code Pull requests Releases Packages Activity Actions

Compare commits

base: alex:f808a584922b07e256869288ce65fbdb4d51b25f
Branches Tags
alex:main
alex:libportability
alex:stinky-debug
..
compare: alex:b42dd002b1800ad57832e17210def4bf2f992296
Branches Tags
alex:main
alex:libportability
alex:stinky-debug

No commits in common. "f808a584922b07e256869288ce65fbdb4d51b25f" and "b42dd002b1800ad57832e17210def4bf2f992296" have entirely different histories.
f808a58492 ... b42dd002b1

3 changed files with 13 additions and 6 deletions
Show stats Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -376,7 +376,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]] [[package]]
name = "baseview" name = "baseview"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.alexjanka.com/alex/baseview#e31a11f1c73c0fdf1463db77105cf9a9b7c9240a" source = "git+https://git.alexjanka.com/alex/baseview#4e6e9737f1f6eb654ea5bfb566f02e3314192b6a"
dependencies = [ dependencies = [
"cocoa 0.24.1", "cocoa 0.24.1",
"core-foundation 0.9.4", "core-foundation 0.9.4",
@ -1317,7 +1317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"libloading 0.7.4", "libloading 0.8.4",
"winapi", "winapi",
] ]
@ -1432,7 +1432,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [ dependencies = [
"libloading 0.7.4", "libloading 0.8.4",
] ]
[[package]] [[package]]
@ -2335,7 +2335,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"com", "com",
"libc", "libc",
"libloading 0.7.4", "libloading 0.8.4",
"thiserror", "thiserror",
"widestring", "widestring",
"winapi", "winapi",
@ -5337,7 +5337,7 @@ dependencies = [
"js-sys", "js-sys",
"khronos-egl", "khronos-egl",
"libc", "libc",
"libloading 0.7.4", "libloading 0.8.4",
"log", "log",
"metal 0.29.0", "metal 0.29.0",
"naga", "naga",

8
xtask/src/main.rs
View file

@ -156,6 +156,14 @@ fn platform_triples<'a>(
architectures architectures
.iter() .iter()
.filter_map(|architecture| get_triple(*platform, *architecture).map(|v| v.triple)) .filter_map(|architecture| get_triple(*platform, *architecture).map(|v| v.triple))
.filter(|triple| {
if is_toolchain_installed(triple) {
true
} else {
log::warn!("toolchain not installed for {triple} - skipping");
false
}
})
} }
fn platforms_and_triples( fn platforms_and_triples(

1
xtask/src/types.rs
View file

@ -42,7 +42,6 @@ pub fn get_triple(
) -> Option<cfg_expr::targets::TargetInfo> { ) -> Option<cfg_expr::targets::TargetInfo> {
cfg_expr::targets::ALL_BUILTINS cfg_expr::targets::ALL_BUILTINS
.iter() .iter()
.filter(|t| crate::is_toolchain_installed(&t.triple))
.find(|b| { .find(|b| {
b.matches(&cfg_expr::TargetPredicate::Arch(architecture.as_cargo())) b.matches(&cfg_expr::TargetPredicate::Arch(architecture.as_cargo()))
&& b.matches(&cfg_expr::TargetPredicate::Os(platform.as_cargo())) && b.matches(&cfg_expr::TargetPredicate::Os(platform.as_cargo()))