build: merge rustlib and libime2

chewing · Sep 7, 2024 · 99ceabe · 99ceabe
1 parent ed83f3f
commit 99ceabe
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/libIME/CMakeLists.txt b/libIME/CMakeLists.txt
@@ -9,15 +9,15 @@ if(NOT Corrosion_FOUND)
     FetchContent_MakeAvailable(Corrosion)
 endif()
 
-corrosion_import_crate(MANIFEST_PATH ../rustlib/Cargo.toml CRATES rustlib CRATE_TYPES staticlib)
-corrosion_add_cxxbridge(rustlib_bridge
-        CRATE rustlib
+corrosion_import_crate(MANIFEST_PATH Cargo.toml CRATES libime2 CRATE_TYPES staticlib)
+corrosion_add_cxxbridge(libime2_bridge
+        CRATE libime2
         FILES lib.rs
 )
-corrosion_add_target_rustflags(rustlib "-C target-feature=+crt-static")
+corrosion_add_target_rustflags(libime2 "-C target-feature=+crt-static")
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_SIMULATE_ID MATCHES "MSVC")
-    corrosion_set_env_vars(rustlib "CFLAGS=-EHsc" "CXXFLAGS=-EHsc")
+    corrosion_set_env_vars(libime2 "CFLAGS=-EHsc" "CXXFLAGS=-EHsc")
 endif()
 
 add_library(libIME_static STATIC
@@ -58,7 +58,7 @@ add_library(libIME_static STATIC
 )
 
 target_link_libraries(libIME_static
-    PUBLIC rustlib_bridge
+    PUBLIC libime2_bridge
     PUBLIC shlwapi.lib
     PUBLIC d2d1.lib
     PUBLIC d3d11.lib

diff --git a/libIME/CandidateWindow.cpp b/libIME/CandidateWindow.cpp
@@ -38,7 +38,7 @@
 #include "EditSession.h"
 #include "NinePatch.h"
 #include "TextService.h"
-#include "rustlib_bridge/lib.h"
+#include "libime2_bridge/lib.h"
 
 using namespace std;
 using winrt::check_hresult;

diff --git a/rustlib/Cargo.lock → libIME/Cargo.lock b/rustlib/Cargo.lock → libIME/Cargo.lock
diff --git a/rustlib/Cargo.toml → libIME/Cargo.toml b/rustlib/Cargo.toml → libIME/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rustlib"
+name = "libime2"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/libIME/NinePatch.cpp b/libIME/NinePatch.cpp
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include "rustlib_bridge/lib.h"
+#include "libime2_bridge/lib.h"
 
 using winrt::check_hresult;
 using winrt::com_ptr;

diff --git a/libIME/NinePatch.h b/libIME/NinePatch.h
@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "rustlib_bridge/lib.h"
+#include "libime2_bridge/lib.h"
 
 class NinePatch {
    public:

diff --git a/rustlib/src/lib.rs → libIME/src/lib.rs b/rustlib/src/lib.rs → libIME/src/lib.rs