From 1a9c9c6fcc371ae2e77f72c60efb13d1e3203039 Mon Sep 17 00:00:00 2001 From: Sam Payson Date: Wed, 25 Feb 2015 02:43:52 -0800 Subject: [PATCH] Modified build.rs for changed gcc interface. --- build.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build.rs b/build.rs index c4eb5b1..2a904a9 100644 --- a/build.rs +++ b/build.rs @@ -2,17 +2,18 @@ extern crate gcc; use std::default::Default; use std::os; +use std::path::PathBuf; fn main() { - let mut cfg: gcc::Config = Default::default(); + let mut cfg: gcc::Config = gcc::Config::new(); - let src_dir = Path::new(os::getenv("CARGO_MANIFEST_DIR").unwrap()).join("png-sys/libpng-1.6.16"); - cfg.include_directories.push(src_dir); + cfg.file("src/shim.c"); - let dep_dir = Path::new(os::getenv("DEP_PNG_ROOT").unwrap()); - cfg.include_directories.push(dep_dir); + let src_dir = PathBuf::new(&os::getenv("CARGO_MANIFEST_DIR").unwrap()).join("png-sys/libpng-1.6.16"); + cfg.include(&src_dir); - gcc::compile_library("libpngshim.a", - &cfg, - &["src/shim.c"]); + let dep_dir = PathBuf::new(&os::getenv("DEP_PNG_ROOT").unwrap()); + cfg.include(&dep_dir); + + cfg.compile("libpngshim.a") }