Addressed some feedback in build script

This commit is contained in:
4bb4 2020-07-12 22:25:27 +02:00
parent d1ce31d8cf
commit 5d293f8f79

View file

@ -3,9 +3,9 @@
// This is taken pretty vanilla from // This is taken pretty vanilla from
// https://github.com/Gekkio/imgui-rs/blob/master/imgui-sys/build.rs // https://github.com/Gekkio/imgui-rs/blob/master/imgui-sys/build.rs
// for now, but expected to diverge from that over time. // for now, but expected to diverge from that over time.
use std::{env, fs, io, path::PathBuf}; use std::{env, fs, io, path::Path};
use bindgen; //use bindgen; // Not used anymore, TODO(4bb4) remove
const CPP_FILES: [&str; 2] = [ const CPP_FILES: [&str; 2] = [
"third-party/cimplot/cimplot.cpp", "third-party/cimplot/cimplot.cpp",
@ -29,36 +29,47 @@ fn main() -> io::Result<()> {
// --- Compile cimgui // --- Compile cimgui
let mut build = cc::Build::new(); let mut build = cc::Build::new();
build.cpp(true); build.cpp(true);
// Disabled due to linking issues
build
.define("CIMGUI_NO_EXPORT", None)
.define("IMGUI_DISABLE_WIN32_FUNCTIONS", None)
.define("IMGUI_DISABLE_OSX_FUNCTIONS", None);
let imgui_third_party = // Take over imgui preprocessor defines from the imgui-sys crate.
env::var_os("DEP_IMGUI_THIRD_PARTY").expect("No envvar found for third_party"); // Taken from https://github.com/aloucks/imguizmo-rs/blob/master/imguizmo-sys/build.rs
println!("third party is {:?}", imgui_third_party); for (key, val) in env::vars().filter(|(key, _)| key.starts_with("DEP_IMGUI_DEFINE_")) {
build.include(imgui_third_party.clone().into_string().unwrap() + "/imgui/"); let key = key.trim_start_matches("DEP_IMGUI_DEFINE_");
let val = if !val.is_empty() {
Some(val.as_str())
} else {
None
};
build.define(key, val);
}
let cimgui_include_path =
env::var_os("DEP_IMGUI_THIRD_PARTY").expect("DEP_IMGUI_THIRD_PARTY not defined");
let imgui_include_path = Path::new(&cimgui_include_path).join("imgui");
build.include(cimgui_include_path);
build.include(imgui_include_path);
// Taken from the imgui-sys build as well
build.flag_if_supported("-Wno-return-type-c-linkage"); build.flag_if_supported("-Wno-return-type-c-linkage");
for path in &CPP_FILES { for path in &CPP_FILES {
assert_file_exists(path)?; assert_file_exists(path)?;
build.file(path); build.file(path);
} }
build.compile("libcimplot.a");
build.compile("cimplot");
// --- Create bindgen bindings // --- Create bindgen bindings
// TODO(4bb4) move this out to separate shell script (see #1)
// The actual generate() errors out right now with parsing errors, // The actual generate() errors out right now with parsing errors,
// will probably need to whiltelist things, fix preprocessor definitions, // will probably need to whiltelist things, fix preprocessor definitions,
// bindgen settings or some combination thereof. // bindgen settings or some combination thereof.
let _bindings = bindgen::Builder::default() //let _bindings = bindgen::Builder::default()
.header(imgui_third_party.into_string().unwrap() + "/cimgui.h") //.header(imgui_third_party.into_string().unwrap() + "/cimgui.h")
.header("wrapper.h") //.header("wrapper.h")
.parse_callbacks(Box::new(bindgen::CargoCallbacks)); //.parse_callbacks(Box::new(bindgen::CargoCallbacks));
//.generate() //.generate()
//.expect("Unable to generate bindings"); //.expect("Unable to generate bindings");
//let out_path = PathBuf::from(env::var("OUT_DIR").unwrap()); //let out_path = std::path::PathBuf::from(env::var("OUT_DIR").unwrap());
//bindings //bindings
//.write_to_file(out_path.join("bindings.rs")) //.write_to_file(out_path.join("bindings.rs"))
//.expect("Couldn't write bindings!"); //.expect("Couldn't write bindings!");