Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V5.2.5 #29

Merged
merged 7 commits into from
Oct 12, 2022
Merged

V5.2.5 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0bff497
building 5.2.5
Oct 12, 2022
5b94687
building 5.2.5
Oct 12, 2022
9d3ef05
Merge branch 'main' into v5.2.5
Oct 12, 2022
51f6f08
building 5.2.5
Oct 12, 2022
6640f60
building 5.2.5
Oct 12, 2022
9f4a962
building 5.2.5
Oct 12, 2022
cc0e891
building 5.2.5
Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "russimp-sys"
version = "1.0.2"
version = "1.0.3"
authors = ["Jhonny Knaak de Vargas"]
edition = "2018"
license-file = "LICENSE"
Expand All @@ -10,7 +10,7 @@ categories = ["rendering", "external-ffi-bindings", "game-engines", "multimedia"
keywords = ["assimp", "3d", "blend", "3ds", "glTF"]
repository = "https://github.com/jkvargas/russimp-sys"
description = "Raw Assimp bindings for rust"
exclude = ["/assimp"]
exclude = ["/assimp", "*.bash", "*.ps1"]

[lib]
name = "russimp_sys"
Expand All @@ -24,9 +24,9 @@ nozlib = []
nolibcxx = []

[build-dependencies]
bindgen = "0.59"
bindgen = "0.59.2"
vcpkg = "0.2.15"
ureq = "2.4"
ureq = "2.5"
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tar = "0.4"
Expand All @@ -35,7 +35,7 @@ num_cpus = "1.13"

[package.metadata.vcpkg]
git = "https://github.com/microsoft/vcpkg"
rev = "8e1f46d"
rev = "7178ff9"

[package.metadata.vcpkg.target]
x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", install = ["assimp", "zlib"] }
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ By default `russimp-sys` links to `libstdc++` in linux and `libc++` in macos, tu

## Changelog

### 1.0.3
* Builds based on 5.2.5 release
### 1.0.0

- Builds based on 5.1.0 release
4 changes: 2 additions & 2 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ fn package(manifest: &BuildManifest, output: impl AsRef<Path>) {

fn download_from_cache(cache_tar_name: impl AsRef<str>, version: impl AsRef<str>) -> BuildManifest {
let download_url = format!(
"https://github.com/EYHN/russimp-sys/releases/download/v{}/{}",
"https://github.com/jkvargas/russimp-sys/releases/download/v{}/{}",
version.as_ref(),
cache_tar_name.as_ref()
);
Expand Down Expand Up @@ -348,7 +348,7 @@ fn main() {
let (include, libdir, libname) = assimp_dynamic_linking();

if cfg!(target_os = "windows") {
let _ = std::process::Command::new("cargo")
let _ = Command::new("cargo")
.arg("vcpkg")
.arg("build")
.output()
Expand Down
6 changes: 3 additions & 3 deletions install_assimp.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ fi
apt install -y git cmake ninja-build

if [ ! -d ${path_assimp_repo} ]; then
git clone --depth 1 --branch v5.1.0 https://github.com/assimp/assimp.git ${path_assimp_repo}
git clone --depth 1 --branch v5.2.5 https://github.com/assimp/assimp.git ${path_assimp_repo}
fi

if [ ! -d ${path_assimp_build} ]; then
mkdir ${path_assimp_build}
mkdir ${path_assimp_build}
# shellcheck disable=SC2164
cd ${path_assimp_build}
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=/usr/bin/clang++-11 -DCMAKE_C_COMPILER=/usr/bin/clang-11 -DCMAKE_INSTALL_PREFIX=/usr/local -G Ninja ..
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_INSTALL_PREFIX=/usr/local -G Ninja ..
ninja
ninja install
fi