Small fixes

k2-fsa · May 3, 2023 · 3965594 · 3965594
1 parent 2f4b376
commit 3965594
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 project(sherpa-ncnn)
 
-set(SHERPA_NCNN_VERSION "1.8.5")
+set(SHERPA_NCNN_VERSION "1.8.6")
 
 # Disable warning about
 #

diff --git a/sherpa-ncnn/csharp-api/sherpa-ncnn.cs b/sherpa-ncnn/csharp-api/sherpa-ncnn.cs
@@ -108,8 +108,11 @@ public class OnlineRecognizer : IDisposable {
 
   private HandleRef _handle;
 
-  // private const string dllName = "sherpa-ncnn-c-api.dll";
+#if LINUX
+  private const string dllName = "libsherpa-ncnn-c-api.so";
+#else
   private const string dllName = "sherpa-ncnn-c-api";
+#endif
 
   [DllImport(dllName, EntryPoint="CreateRecognizer")]
   public static extern IntPtr CreateOnlineRecognizer(ref OnlineRecognizerConfig config);
@@ -167,8 +170,11 @@ public class OnlineStream : IDisposable {
   private HandleRef _handle;
   public IntPtr Handle => _handle.Handle;
 
-  // private const string dllName = "sherpa-ncnn-c-api.dll";
+#if LINUX
+  private const string dllName = "libsherpa-ncnn-c-api.so";
+#else
   private const string dllName = "sherpa-ncnn-c-api";
+#endif
 
   [DllImport(dllName, EntryPoint="DestroyStream")]
   public static extern void DestroyOnlineStream(IntPtr handle);

diff --git a/sherpa-ncnn/csharp-api/sherpa-ncnn.csproj.in b/sherpa-ncnn/csharp-api/sherpa-ncnn.csproj.in
@@ -36,6 +36,14 @@
     <DelaySign>false</DelaySign>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(IsLinux)'=='true'">
+   <DefineConstants>Linux</DefineConstants>
+  </PropertyGroup>
+
 
   <ItemGroup>
     <None Include="./README.md" Pack="true" PackagePath="/"/>