forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from randomPoison/use-cc

Browse Source 
Build mikktspace using cc instead of cmake
This commit is contained in:
David Harvey-Macaulay 2018-07-24 18:31:08 +01:00 committed by GitHub
commit 9a0a981405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,3 @@
/target/ /target/
/mikktspace-sys/target/
/mikktspace-sys/libmikktspace/libmikktspace.a
**/*.rs.bk **/*.rs.bk
Cargo.lock Cargo.lock

2
Cargo.toml
View File

@ -16,7 +16,7 @@ exclude = ["examples/**"]
travis-ci = { repository = "gltf-rs/mikktspace" } travis-ci = { repository = "gltf-rs/mikktspace" }
[build-dependencies] [build-dependencies]
cmake = "0.1" cc = "1.0"
[dev-dependencies] [dev-dependencies]
cgmath = "0.15" cgmath = "0.15"

11
build.rs
View File

@ -1,9 +1,8 @@
extern crate cc;
extern crate cmake;
fn main() { fn main() {
let dst = cmake::build("libmikktspace"); cc::Build::new()
println!("cargo:rustc-link-search=native={}", dst.display()); .file("libmikktspace/mikktspace.c")
println!("cargo:rustc-link-lib=static=mikktspace"); .include("libmikktspace")
.compile("mikktspace");
} }

11
libmikktspace/CMakeLists.txt
View File

@ -1,11 +0,0 @@
cmake_minimum_required(VERSION 2.8)
project(mikktspace)
set(PROJECT_VERSION_MAJOR "0")
set(PROJECT_VERSION_MINOR "1")
set(PROJECT_VERSION_PATCH "0")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c1x")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG} -ggdb -DDEBUG")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE} -O2")
set(SOURCES mikktspace.h mikktspace.c)
add_library(mikktspace STATIC ${SOURCES})
install(TARGETS mikktspace ARCHIVE DESTINATION ".")