From d4de88729159b7c331b3b268fdcc67627e9678d4 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 11 Nov 2021 21:00:09 +0800 Subject: rename to .rsx --- tests/projects/rust/cxx_call_rust_library/src/bridge.rs | 6 ------ tests/projects/rust/cxx_call_rust_library/src/bridge.rsx | 6 ++++++ tests/projects/rust/cxx_call_rust_library/xmake.lua | 4 ++-- xmake/rules/rust/xmake.lua | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 tests/projects/rust/cxx_call_rust_library/src/bridge.rs create mode 100644 tests/projects/rust/cxx_call_rust_library/src/bridge.rsx diff --git a/tests/projects/rust/cxx_call_rust_library/src/bridge.rs b/tests/projects/rust/cxx_call_rust_library/src/bridge.rs deleted file mode 100644 index 3710f4bfd..000000000 --- a/tests/projects/rust/cxx_call_rust_library/src/bridge.rs +++ /dev/null @@ -1,6 +0,0 @@ -#[cxx::bridge] -mod foo { - extern "Rust" { - fn add(a: i32, b: i32) -> i32; - } -} diff --git a/tests/projects/rust/cxx_call_rust_library/src/bridge.rsx b/tests/projects/rust/cxx_call_rust_library/src/bridge.rsx new file mode 100644 index 000000000..3710f4bfd --- /dev/null +++ b/tests/projects/rust/cxx_call_rust_library/src/bridge.rsx @@ -0,0 +1,6 @@ +#[cxx::bridge] +mod foo { + extern "Rust" { + fn add(a: i32, b: i32) -> i32; + } +} diff --git a/tests/projects/rust/cxx_call_rust_library/xmake.lua b/tests/projects/rust/cxx_call_rust_library/xmake.lua index 00725b02f..cfd0e035e 100644 --- a/tests/projects/rust/cxx_call_rust_library/xmake.lua +++ b/tests/projects/rust/cxx_call_rust_library/xmake.lua @@ -6,7 +6,7 @@ target("foo") target("test") set_kind("binary") - add_rules("rust.cxxbridge", {override = true}) + add_rules("rust.cxxbridge") add_deps("foo") add_files("src/main.cc") - add_files("src/bridge.rs") + add_files("src/bridge.rsx") diff --git a/xmake/rules/rust/xmake.lua b/xmake/rules/rust/xmake.lua index 08fcf11f0..51e27fcc8 100644 --- a/xmake/rules/rust/xmake.lua +++ b/xmake/rules/rust/xmake.lua @@ -21,8 +21,8 @@ -- generate bridge.rs.cc/h to call rust library in c++ code -- @see https://cxx.rs/build/other.html rule("rust.cxxbridge") - set_extensions(".rs") - before_build_file(function (target, sourcefile, opt) + set_extensions(".rsx") + before_buildcmd_file(function (target, batchcmds, sourcefile, opt) print(sourcefile) end) -- cgit v1.3.1