diff --git a/.gitignore b/.gitignore index 5d6a2baca9..6aa106405a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ /target/ -/mikktspace-sys/target/ -/mikktspace-sys/libmikktspace/libmikktspace.a **/*.rs.bk Cargo.lock diff --git a/Cargo.toml b/Cargo.toml index 9d62202461..9578194843 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ exclude = ["examples/**"] travis-ci = { repository = "gltf-rs/mikktspace" } [build-dependencies] -cmake = "0.1" +cc = "1.0" [dev-dependencies] cgmath = "0.15" diff --git a/build.rs b/build.rs index 155a9ed067..2994458387 100644 --- a/build.rs +++ b/build.rs @@ -1,9 +1,8 @@ - -extern crate cmake; +extern crate cc; fn main() { - let dst = cmake::build("libmikktspace"); - println!("cargo:rustc-link-search=native={}", dst.display()); - println!("cargo:rustc-link-lib=static=mikktspace"); + cc::Build::new() + .file("libmikktspace/mikktspace.c") + .include("libmikktspace") + .compile("mikktspace"); } - diff --git a/libmikktspace/CMakeLists.txt b/libmikktspace/CMakeLists.txt deleted file mode 100644 index 2ca07ddf4d..0000000000 --- a/libmikktspace/CMakeLists.txt +++ /dev/null @@ -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 ".")