Browse Source

Fixing emscripten on windows to use the right files.

cmd
Val Vanderschaegen 8 years ago
parent
commit
5791531895
  1. 28
      src/lib.rs

28
src/lib.rs

@ -860,11 +860,22 @@ impl Config {
}) })
.or_else(|| { .or_else(|| {
if target.contains("emscripten") { if target.contains("emscripten") {
if self.cpp { //Windows uses bat file so we have to be a bit more specific
Some(Tool::new(PathBuf::from("em++"))) let tool = if self.cpp {
if cfg!(windows) {
"em++.bat"
} else {
"em++"
}
} else { } else {
Some(Tool::new(PathBuf::from("emcc"))) if cfg!(windows) {
} "emcc.bat"
} else {
"emcc"
}
};
Some(Tool::new(PathBuf::from(tool)))
} else { } else {
None None
} }
@ -992,7 +1003,14 @@ impl Config {
if self.get_target().contains("android") { if self.get_target().contains("android") {
PathBuf::from(format!("{}-ar", self.get_target().replace("armv7", "arm"))) PathBuf::from(format!("{}-ar", self.get_target().replace("armv7", "arm")))
} else if self.get_target().contains("emscripten") { } else if self.get_target().contains("emscripten") {
PathBuf::from("emar") //Windows use bat files so we have to be a bit more specific
let tool = if cfg!(windows) {
"emar.bat"
} else {
"emar"
};
PathBuf::from(tool)
} else { } else {
PathBuf::from("ar") PathBuf::from("ar")
} }

Loading…
Cancel
Save