diff --git a/cmake/nuttx_add_rust.cmake b/cmake/nuttx_add_rust.cmake index 742bc3be5dc..97ecdcec73a 100644 --- a/cmake/nuttx_add_rust.cmake +++ b/cmake/nuttx_add_rust.cmake @@ -150,6 +150,8 @@ function(nuttx_add_rust) add_custom_command( OUTPUT ${RUST_LIB_PATH} COMMAND + ${CMAKE_COMMAND} -E env + NUTTX_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/include:${CMAKE_BINARY_DIR}/include:${CMAKE_BINARY_DIR}/include/arch cargo build --${RUST_PROFILE} -Zbuild-std=std,panic_abort ${RUST_DEBUG_FLAGS} --manifest-path ${CRATE_PATH}/Cargo.toml --target ${RUST_TARGET} --target-dir ${RUST_BUILD_DIR} diff --git a/examples/rust/slint/Cargo.toml b/examples/rust/slint/Cargo.toml index 4600f2220b2..af585ceb15d 100644 --- a/examples/rust/slint/Cargo.toml +++ b/examples/rust/slint/Cargo.toml @@ -18,7 +18,7 @@ opt-level = 'z' [dependencies] libc = "0.2" slint = { version = "1.9", default-features = false, features = ["compat-1-2", "renderer-software", "libm", "unsafe-single-threaded"] } -nuttx = { git = "https://github.com/no1wudi/nuttx-rs.git", branch = "master" } +nuttx = { git = "https://github.com/no1wudi/nuttx-rs.git", branch = "main" } [build-dependencies] slint-build = { version = "1.9" } diff --git a/examples/rust/slint/src/lib.rs b/examples/rust/slint/src/lib.rs index 043274cbc64..7f81ce29cd3 100644 --- a/examples/rust/slint/src/lib.rs +++ b/examples/rust/slint/src/lib.rs @@ -94,7 +94,7 @@ pub extern "C" fn slint_main() { println!("{:?}", planeinfo); println!("{:?}", videoinfo); - if videoinfo.fmt != Format::RGB565 as u8 { + if videoinfo.fmt != FB_FMT_RGB16_565 as u8 { println!("Unsupported pixel format, only RGB565 is supported for now"); return; } diff --git a/tools/Rust.mk b/tools/Rust.mk index 337d323ddf0..9a77ae57bbd 100644 --- a/tools/Rust.mk +++ b/tools/Rust.mk @@ -89,7 +89,8 @@ endef ifeq ($(CONFIG_DEBUG_FULLOPT),y) define RUST_CARGO_BUILD - cargo build --release -Zbuild-std=std,panic_abort \ + NUTTX_INCLUDE_DIR=$(TOPDIR)/include:$(TOPDIR)/include/arch \ + cargo build --release -Zbuild-std=std,panic_abort \ -Zbuild-std-features=panic_immediate_abort \ --manifest-path $(2)/$(1)/Cargo.toml \ --target $(call RUST_TARGET_TRIPLE) @@ -97,7 +98,8 @@ endef else define RUST_CARGO_BUILD @echo "Building Rust code with cargo..." - cargo build -Zbuild-std=std,panic_abort \ + NUTTX_INCLUDE_DIR=$(TOPDIR)/include:$(TOPDIR)/include/arch \ + cargo build -Zbuild-std=std,panic_abort \ --manifest-path $(2)/$(1)/Cargo.toml \ --target $(call RUST_TARGET_TRIPLE) endef