diff --git a/libime/data/zh_CN.lm b/libime/data/zh_CN.lm index 432bb0c9..2f19f830 100644 Binary files a/libime/data/zh_CN.lm and b/libime/data/zh_CN.lm differ diff --git a/libime/data/zh_CN.lm.predict b/libime/data/zh_CN.lm.predict index cb2984ff..edf41b45 100644 Binary files a/libime/data/zh_CN.lm.predict and b/libime/data/zh_CN.lm.predict differ diff --git a/librime/arm64-v8a/include/rime_api.h b/librime/arm64-v8a/include/rime_api.h index 94de3091..2fccde0f 100644 --- a/librime/arm64-v8a/include/rime_api.h +++ b/librime/arm64-v8a/include/rime_api.h @@ -18,15 +18,19 @@ extern "C" { #if defined(_WIN32) #if defined(RIME_EXPORTS) /* DLL export */ -#define RIME_API __declspec(dllexport) +#define RIME_DLL __declspec(dllexport) +#define RIME_API extern "C" RIME_DLL #elif defined(RIME_IMPORTS) /* DLL import */ -#define RIME_API __declspec(dllimport) +#define RIME_DLL __declspec(dllimport) +#define RIME_API extern "C" RIME_DLL #else /* static library */ +#define RIME_DLL #define RIME_API #endif #else /* _WIN32 */ +#define RIME_DLL #define RIME_API #endif /* _WIN32 */ diff --git a/librime/arm64-v8a/lib/librime.a b/librime/arm64-v8a/lib/librime.a index bfa04398..28295095 100644 Binary files a/librime/arm64-v8a/lib/librime.a and b/librime/arm64-v8a/lib/librime.a differ diff --git a/librime/armeabi-v7a/include/rime_api.h b/librime/armeabi-v7a/include/rime_api.h index 94de3091..2fccde0f 100644 --- a/librime/armeabi-v7a/include/rime_api.h +++ b/librime/armeabi-v7a/include/rime_api.h @@ -18,15 +18,19 @@ extern "C" { #if defined(_WIN32) #if defined(RIME_EXPORTS) /* DLL export */ -#define RIME_API __declspec(dllexport) +#define RIME_DLL __declspec(dllexport) +#define RIME_API extern "C" RIME_DLL #elif defined(RIME_IMPORTS) /* DLL import */ -#define RIME_API __declspec(dllimport) +#define RIME_DLL __declspec(dllimport) +#define RIME_API extern "C" RIME_DLL #else /* static library */ +#define RIME_DLL #define RIME_API #endif #else /* _WIN32 */ +#define RIME_DLL #define RIME_API #endif /* _WIN32 */ diff --git a/librime/armeabi-v7a/lib/librime.a b/librime/armeabi-v7a/lib/librime.a index 720ee20f..6c234c01 100644 Binary files a/librime/armeabi-v7a/lib/librime.a and b/librime/armeabi-v7a/lib/librime.a differ diff --git a/librime/x86/include/rime_api.h b/librime/x86/include/rime_api.h index 94de3091..2fccde0f 100644 --- a/librime/x86/include/rime_api.h +++ b/librime/x86/include/rime_api.h @@ -18,15 +18,19 @@ extern "C" { #if defined(_WIN32) #if defined(RIME_EXPORTS) /* DLL export */ -#define RIME_API __declspec(dllexport) +#define RIME_DLL __declspec(dllexport) +#define RIME_API extern "C" RIME_DLL #elif defined(RIME_IMPORTS) /* DLL import */ -#define RIME_API __declspec(dllimport) +#define RIME_DLL __declspec(dllimport) +#define RIME_API extern "C" RIME_DLL #else /* static library */ +#define RIME_DLL #define RIME_API #endif #else /* _WIN32 */ +#define RIME_DLL #define RIME_API #endif /* _WIN32 */ diff --git a/librime/x86/lib/librime.a b/librime/x86/lib/librime.a index 558a1b30..bb325e50 100644 Binary files a/librime/x86/lib/librime.a and b/librime/x86/lib/librime.a differ diff --git a/librime/x86_64/include/rime_api.h b/librime/x86_64/include/rime_api.h index 94de3091..2fccde0f 100644 --- a/librime/x86_64/include/rime_api.h +++ b/librime/x86_64/include/rime_api.h @@ -18,15 +18,19 @@ extern "C" { #if defined(_WIN32) #if defined(RIME_EXPORTS) /* DLL export */ -#define RIME_API __declspec(dllexport) +#define RIME_DLL __declspec(dllexport) +#define RIME_API extern "C" RIME_DLL #elif defined(RIME_IMPORTS) /* DLL import */ -#define RIME_API __declspec(dllimport) +#define RIME_DLL __declspec(dllimport) +#define RIME_API extern "C" RIME_DLL #else /* static library */ +#define RIME_DLL #define RIME_API #endif #else /* _WIN32 */ +#define RIME_DLL #define RIME_API #endif /* _WIN32 */ diff --git a/librime/x86_64/lib/librime.a b/librime/x86_64/lib/librime.a index f68d7d2e..a069cf2d 100644 Binary files a/librime/x86_64/lib/librime.a and b/librime/x86_64/lib/librime.a differ diff --git a/toolchain-versions.json b/toolchain-versions.json index 30a01c9d..1b9a1753 100644 --- a/toolchain-versions.json +++ b/toolchain-versions.json @@ -2,5 +2,5 @@ "cmake": "3.22.1", "ndk": " 25.2.9519653", "platform": 23, - "prebuilder": "875ff994026f254ebea67972a236526281edf697" + "prebuilder": "023caf0f33df93be636947f124a3bc90237fa55a" } \ No newline at end of file