Fix linking (#2546)

@@ -372,7 +372,6 @@ endif()
 include(kaldi-native-fbank)
 include(kaldi-decoder)
 include(onnxruntime)
-include(cppinyin)
 include(simple-sentencepiece)
 set(ONNXRUNTIME_DIR ${onnxruntime_SOURCE_DIR})
 message(STATUS "ONNXRUNTIME_DIR: ${ONNXRUNTIME_DIR}")
@@ -398,6 +397,8 @@ if(SHERPA_ONNX_ENABLE_WEBSOCKET)
 endif()
 
 if(SHERPA_ONNX_ENABLE_TTS)
+  include(cppinyin)
+
   include(espeak-ng-for-piper)
   set(ESPEAK_NG_DIR ${espeak_ng_SOURCE_DIR})
   message(STATUS "ESPEAK_NG_DIR: ${ESPEAK_NG_DIR}")

@@ -127,7 +127,7 @@ cmake --build build/os64 --target install
 echo "Generate xcframework"
 
 mkdir -p "build/simulator/lib"
-for f in libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
+for f in libcppinyin_core.a libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
          libsherpa-onnx-fstfar.a libssentencepiece_core.a \
          libsherpa-onnx-fst.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a \
          libucd.a libpiper_phonemize.a libespeak-ng.a; do
@@ -139,6 +139,7 @@ done
 # Merge archive first, because the following xcodebuild create xcframework
 # cannot accept multi archive with the same architecture.
 libtool -static -o build/simulator/sherpa-onnx.a \
+  build/simulator/lib/libcppinyin_core.a \
   build/simulator/lib/libkaldi-native-fbank-core.a \
   build/simulator/lib/libkissfft-float.a \
   build/simulator/lib/libsherpa-onnx-c-api.a \
@@ -153,6 +154,7 @@ libtool -static -o build/simulator/sherpa-onnx.a \
   build/simulator/lib/libssentencepiece_core.a
 
 libtool -static -o build/os64/sherpa-onnx.a \
+  build/os64/lib/libcppinyin_core.a \
   build/os64/lib/libkaldi-native-fbank-core.a \
   build/os64/lib/libkissfft-float.a \
   build/os64/lib/libsherpa-onnx-c-api.a \

@@ -27,6 +27,7 @@ make install
 rm -fv ./install/include/cargs.h
 
 libtool -static -o ./install/lib/libsherpa-onnx.a \
+  ./install/lib/libcppinyin_core.a \
   ./install/lib/libsherpa-onnx-c-api.a \
   ./install/lib/libsherpa-onnx-core.a \
   ./install/lib/libkaldi-native-fbank-core.a \

@@ -4,7 +4,7 @@ CUR_DIR :=$(shell pwd)
 CFLAGS := -I ../ -I ../build/_deps/cargs-src/include/
 LDFLAGS := -L ../build/lib
 LDFLAGS += -L ../build/_deps/onnxruntime-src/lib
-LDFLAGS += -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lcargs -lonnxruntime
+LDFLAGS += -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lcargs -lonnxruntime -lcppinyin_core
 LDFLAGS += -framework Foundation
 LDFLAGS += -lc++
 LDFLAGS += -Wl,-rpath,${CUR_DIR}/../build/lib

@@ -22,4 +22,4 @@ Cflags: -I"${includedir}"
 # Note: -lcargs is required only for the following file
 # https://github.com/k2-fsa/sherpa-onnx/blob/master/c-api-examples/decode-file-c-api.c
 # We add it here so that users don't need to specify -lcargs when compiling decode-file-c-api.c
-Libs: -L"${libdir}" -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lonnxruntime -lssentencepiece_core -Wl,-rpath,${libdir} @SHERPA_ONNX_PKG_WITH_CARGS@ @SHERPA_ONNX_PKG_CONFIG_EXTRA_LIBS@
+Libs: -L"${libdir}" -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lonnxruntime -lssentencepiece_core -lcppinyin_core -Wl,-rpath,${libdir} @SHERPA_ONNX_PKG_WITH_CARGS@ @SHERPA_ONNX_PKG_CONFIG_EXTRA_LIBS@

@@ -15,6 +15,7 @@
         sherpa-onnx-fst.lib;
         kaldi-native-fbank-core.lib;
         kissfft-float.lib;
+        cppinyin_core.lib;
         onnxruntime.lib;
         piper_phonemize.lib;
         espeak-ng.lib;

@@ -15,6 +15,7 @@
         sherpa-onnx-fst.lib;
         kaldi-native-fbank-core.lib;
         kissfft-float.lib;
+        cppinyin_core.lib;
         onnxruntime.lib;
         piper_phonemize.lib;
         espeak-ng.lib;

@@ -15,6 +15,7 @@
         sherpa-onnx-fst.lib;
         kaldi-native-fbank-core.lib;
         kissfft-float.lib;
+        cppinyin_core.lib;
         onnxruntime.lib;
         piper_phonemize.lib;
         espeak-ng.lib;

@@ -354,12 +354,12 @@ OfflineRecognizerResult OfflineRecognizer::GetResult(
     ans.lang = r->lang ? r->lang : "";
     ans.emotion = r->emotion ? r->emotion : "";
     ans.event = r->event ? r->event : "";
-  }
 
     if (r->durations) {
       ans.durations.resize(r->count);
       std::copy(r->durations, r->durations + r->count, ans.durations.data());
     }
+  }
 
   SherpaOnnxDestroyOfflineRecognizerResult(r);
 

@@ -268,7 +268,6 @@ if(ANDROID_NDK)
 endif()
 
 target_link_libraries(sherpa-onnx-core
-  cppinyin_core
   kaldi-native-fbank-core
   kaldi-decoder-core
   ssentencepiece_core
@@ -311,7 +310,9 @@ endif()
 target_link_libraries(sherpa-onnx-core fstfar fst)
 
 if(SHERPA_ONNX_ENABLE_TTS)
-  target_link_libraries(sherpa-onnx-core piper_phonemize)
+  target_link_libraries(sherpa-onnx-core
+    cppinyin_core
+    piper_phonemize)
 endif()
 target_link_libraries(sherpa-onnx-core cppjieba)
 

@@ -663,6 +663,7 @@ const
      {$linklib sherpa-onnx-kaldifst-core}
      {$linklib sherpa-onnx-fstfar}
      {$linklib sherpa-onnx-fst}
+     {$linklib cppinyin_core}
      {$linklib kissfft-float}
      {$linklib kaldi-native-fbank-core}
      {$linklib piper_phonemize}