rafaelcaricio/lvgl-rs
1
0
Fork 0
Code Issues 12 Pull requests 2 Projects Releases 4 Wiki Activity

Fix packaging with vendor location

Browse source
This commit is contained in:
Rafael Caricio 2020-04-12 13:41:36 +02:00
parent 8da0d9ee80
commit e68275a7c8
4 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "vendor/lvgl"] [submodule "lvgl-sys/vendor/lv_sim_eclipse_sdl"]
path = vendor/lvgl path = lvgl-sys/vendor/lv_sim_eclipse_sdl
url = https://github.com/littlevgl/lvgl.git
[submodule "vendor/lv_sim_eclipse_sdl"]
path = vendor/lv_sim_eclipse_sdl
url = https://github.com/rafaelcaricio/lv_sim_eclipse_sdl.git url = https://github.com/rafaelcaricio/lv_sim_eclipse_sdl.git
[submodule "lvgl-sys/vendor/lvgl"]
path = lvgl-sys/vendor/lvgl
url = https://github.com/littlevgl/lvgl.git

29
lvgl-sys/build.rs
View file

@ -6,26 +6,25 @@ fn main() {
let project_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()) let project_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
.canonicalize() .canonicalize()
.unwrap(); .unwrap();
let root_dir = project_dir.parent().unwrap(); let vendor = project_dir.join("vendor");
let vendor = root_dir.join("vendor"); let vendor_src = vendor.join("lvgl").join("src");
let lvgl_sys_src = root_dir.join("lvgl-sys").join("src");
let src = vendor.join("lvgl").join("src");
// TODO: Make it configurable! Needs to be linked to final proj defs, define as an env var. // TODO: Make it configurable! Needs to be linked to final proj defs, define as an env var.
let lvgl_config_path = vendor.join("lv_sim_eclipse_sdl"); let lvgl_config_path = vendor.join("lv_sim_eclipse_sdl");
let mut cfg = Build::new(); let mut cfg = Build::new();
add_c_files(&mut cfg, src.join("lv_core")); add_c_files(&mut cfg, vendor_src.join("lv_core"));
add_c_files(&mut cfg, src.join("lv_draw")); add_c_files(&mut cfg, vendor_src.join("lv_draw"));
add_c_files(&mut cfg, src.join("lv_font")); add_c_files(&mut cfg, vendor_src.join("lv_font"));
add_c_files(&mut cfg, src.join("lv_hal")); add_c_files(&mut cfg, vendor_src.join("lv_hal"));
add_c_files(&mut cfg, src.join("lv_misc")); add_c_files(&mut cfg, vendor_src.join("lv_misc"));
add_c_files(&mut cfg, src.join("lv_objx")); add_c_files(&mut cfg, vendor_src.join("lv_objx"));
add_c_files(&mut cfg, src.join("lv_themes")); add_c_files(&mut cfg, vendor_src.join("lv_themes"));
cfg.define("LV_CONF_INCLUDE_SIMPLE", Some("1")) cfg.define("LV_CONF_INCLUDE_SIMPLE", Some("1"))
.include(&src) .include(&vendor_src)
.include(&vendor)
.warnings(false) .warnings(false)
.include(&lvgl_config_path) .include(&lvgl_config_path)
.compile("lvgl"); .compile("lvgl");
@ -34,9 +33,11 @@ fn main() {
"-DLV_CONF_INCLUDE_SIMPLE=1", "-DLV_CONF_INCLUDE_SIMPLE=1",
"-I", "-I",
lvgl_config_path.to_str().unwrap(), lvgl_config_path.to_str().unwrap(),
"-I",
vendor.to_str().unwrap()
]; ];
bindgen::Builder::default() bindgen::Builder::default()
.header(src.parent().unwrap().join("lvgl.h").to_str().unwrap()) .header(vendor_src.parent().unwrap().join("lvgl.h").to_str().unwrap())
.layout_tests(false) .layout_tests(false)
.use_core() .use_core()
.ctypes_prefix("cty") .ctypes_prefix("cty")
@ -44,7 +45,7 @@ fn main() {
.clang_args(&cc_args) .clang_args(&cc_args)
.generate() .generate()
.expect("Unable to generate bindings") .expect("Unable to generate bindings")
.write_to_file(lvgl_sys_src.join("bindings.rs")) .write_to_file(project_dir.join("src").join("bindings.rs"))
.expect("Can't write bindings!"); .expect("Can't write bindings!");
} }

0
vendor/lv_sim_eclipse_sdl → lvgl-sys/vendor/lv_sim_eclipse_sdl vendored
View file

0
vendor/lvgl → lvgl-sys/vendor/lvgl vendored
View file