alex/ash-molten
1
0
Fork 0
mirror of https://github.com/italicsjenga/ash-molten.git synced 2024-12-23 13:21:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix script (#2)

Browse source
This commit is contained in:
Jake Shadle 2019-06-25 18:46:31 +02:00 committed by GitHub
parent 74914007cc
commit b19fc845cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
build.rs
View file

@ -28,6 +28,8 @@ mod mac {
}, },
}; };
let checkout_dir = "MoltenVK";
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let wants_exit = exit.clone(); let wants_exit = exit.clone();
@ -45,8 +47,9 @@ mod mac {
} }
}); });
let git_status = if Path::new("MoltenVK").exists() { let git_status = if Path::new(checkout_dir).exists() {
Command::new("git") Command::new("git")
.current_dir(checkout_dir)
.arg("pull") .arg("pull")
.spawn() .spawn()
.expect("failed to spawn git") .expect("failed to spawn git")
@ -65,7 +68,7 @@ mod mac {
assert!(git_status.success(), "failed to clone MoltenVK"); assert!(git_status.success(), "failed to clone MoltenVK");
let status = Command::new("sh") let status = Command::new("sh")
.current_dir("MoltenVK") .current_dir(checkout_dir)
.arg("fetchDependencies") .arg("fetchDependencies")
.spawn() .spawn()
.expect("failed to spawn fetchDependencies") .expect("failed to spawn fetchDependencies")
@ -96,7 +99,7 @@ mod mac {
let src = { let src = {
let mut pb = PathBuf::new(); let mut pb = PathBuf::new();
pb.push("MoltenVK"); pb.push(checkout_dir);
pb.push("Package/Release/MoltenVK"); pb.push("Package/Release/MoltenVK");
pb.push(dir); pb.push(dir);
pb.push("static/libMoltenVK.a"); pb.push("static/libMoltenVK.a");
@ -106,7 +109,11 @@ mod mac {
let target = { let target = {
let mut pb = PathBuf::new(); let mut pb = PathBuf::new();
pb.push(target_dir); pb.push(target_dir);
pb.push(format!("lib{}MoltenVK.a", target_name)); pb.push(target_name);
std::fs::create_dir_all(&pb).expect("failed to create output directory");
pb.push("libMoltenVK.a");
pb pb
}; };
@ -126,24 +133,21 @@ fn main() {
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
// The 'external' feature was not enabled. Molten will be built automaticaly. // The 'external' feature was not enabled. Molten will be built automaticaly.
let target_name = if !is_external_enabled() { if !is_external_enabled() {
let target_dir = Path::new("native"); let target_dir = Path::new("native");
let target_name = build_molten(&target_dir); let target_name = build_molten(&target_dir);
let project_dir = PathBuf::from( let project_dir = {
std::env::var("CARGO_MANIFEST_DIR").expect("unable to find env:CARGO_MANIFEST_DIR"), let mut pb = PathBuf::from(
) std::env::var("CARGO_MANIFEST_DIR").expect("unable to find env:CARGO_MANIFEST_DIR"),
.join(target_dir); );
println!("cargo:rustc-link-search=native={}", project_dir.display()); pb.push(target_dir);
pb.push(target_name);
pb
};
target_name println!("cargo:rustc-link-search=native={}", project_dir.display());
} else if cfg!(target_os = "macos") { }
"macos"
} else if cfg!(target_os = "ios") {
"ios"
} else {
unreachable!();
};
println!("cargo:rustc-link-lib=framework=Metal"); println!("cargo:rustc-link-lib=framework=Metal");
println!("cargo:rustc-link-lib=framework=AppKit"); println!("cargo:rustc-link-lib=framework=AppKit");
@ -151,7 +155,7 @@ fn main() {
println!("cargo:rustc-link-lib=framework=IOKit"); println!("cargo:rustc-link-lib=framework=IOKit");
println!("cargo:rustc-link-lib=framework=IOSurface"); println!("cargo:rustc-link-lib=framework=IOSurface");
println!("cargo:rustc-link-lib=dylib=c++"); println!("cargo:rustc-link-lib=dylib=c++");
println!("cargo:rustc-link-lib=static={}MoltenVK", target_name); println!("cargo:rustc-link-lib=static=MoltenVK");
} }
#[cfg(not(any(target_os = "macos", target_os = "ios")))] #[cfg(not(any(target_os = "macos", target_os = "ios")))]