Skip to content

Commit

Permalink
Merge pull request #43 from AlexTMjugador/feat/reintroduce-mingw-support
Browse files Browse the repository at this point in the history
Reintroduce Windows GNU target support
  • Loading branch information
Jhonny Knaak de Vargas authored May 6, 2024
2 parents 42113ff + 46d07a9 commit 72b3bfd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ We build, test, and provide prebuilt packages for the following targets:
Additional targets that work when building from source:
- aarch64-apple-darwin (M1 Macs, cross-compiled on x86_64.)
- aarch64-unknown-linux-gnu (Raspberry Pi 4b, built on the machine itself.)

Platforms that are not supported and won't build:
- x86_64-pc-windows-gnu (See: [assimp/4686]([https://github.com/assimp/assimp/issues/4868))
- x86_64-pc-windows-gnu

## Installation

Expand Down
6 changes: 1 addition & 5 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ fn compiler_flags() -> Vec<&'static str> {
fn lib_names() -> Vec<Library> {
let mut names = Vec::new();

if cfg!(target_os = "windows") && cfg!(target_env = "gnu") {
panic!("Windows GNU is not supported, assimp fails to build for some reason.\nSee https://github.com/assimp/assimp/issues/4868");
} else {
names.push(Library("assimp", static_lib()));
}
names.push(Library("assimp", static_lib()));

if build_assimp() && build_zlib() {
names.push(Library("zlibstatic", "static"));
Expand Down

0 comments on commit 72b3bfd

Please sign in to comment.