small fixes

k2-fsa · Nov 28, 2023 · b78dbb6 · b78dbb6
1 parent 9a5e284
commit b78dbb6
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 9 deletions.
diff --git a/build-aarch64-linux-gnu.sh b/build-aarch64-linux-gnu.sh
@@ -45,7 +45,6 @@ if [[ x"$BUILD_SHARED_LIBS" == x"" ]]; then
 fi
 
 cmake \
-  -DCMAKE_CXX_STANDARD=17 \
   -DBUILD_PIPER_PHONMIZE_EXE=OFF \
   -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
   -DBUILD_ESPEAK_NG_EXE=OFF \

diff --git a/build-android-arm64-v8a.sh b/build-android-arm64-v8a.sh
@@ -72,7 +72,6 @@ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR"
 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
 
 cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
-    -DONNXRUNTIME_DIR=/ \
     -DBUILD_PIPER_PHONMIZE_EXE=OFF \
     -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
     -DBUILD_ESPEAK_NG_EXE=OFF \

diff --git a/build-android-armv7-eabi.sh b/build-android-armv7-eabi.sh
@@ -73,7 +73,6 @@ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR"
 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
 
 cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
-    -DONNXRUNTIME_DIR=/ \
     -DBUILD_PIPER_PHONMIZE_EXE=OFF \
     -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
     -DBUILD_ESPEAK_NG_EXE=OFF \

diff --git a/build-android-x86-64.sh b/build-android-x86-64.sh
@@ -73,7 +73,6 @@ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR"
 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
 
 cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
-    -DONNXRUNTIME_DIR=/ \
     -DBUILD_PIPER_PHONMIZE_EXE=OFF \
     -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
     -DBUILD_ESPEAK_NG_EXE=OFF \

diff --git a/build-android-x86.sh b/build-android-x86.sh
@@ -73,7 +73,6 @@ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR"
 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
 
 cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
-    -DONNXRUNTIME_DIR=/ \
     -DBUILD_PIPER_PHONMIZE_EXE=OFF \
     -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
     -DBUILD_ESPEAK_NG_EXE=OFF \

diff --git a/build-ios.sh b/build-ios.sh
@@ -51,7 +51,6 @@ echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
 #
 
 cmake \
-  -DONNXRUNTIME_DIR=/ \
   -DBUILD_PIPER_PHONMIZE_EXE=OFF \
   -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
   -DBUILD_ESPEAK_NG_EXE=OFF \
@@ -79,7 +78,6 @@ cmake --build build/simulator_x86_64 -j 4 --verbose
 echo "Building for simulator (arm64)"
 
 cmake \
-  -DONNXRUNTIME_DIR=/ \
   -DBUILD_PIPER_PHONMIZE_EXE=OFF \
   -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
   -DBUILD_ESPEAK_NG_EXE=OFF \
@@ -111,7 +109,6 @@ export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/ios-onnxruntime/onnxruntime.xcframework/i
 
 
 cmake \
-  -DONNXRUNTIME_DIR=/ \
   -DBUILD_PIPER_PHONMIZE_EXE=OFF \
   -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
   -DBUILD_ESPEAK_NG_EXE=OFF \

diff --git a/cmake/espeak-ng-for-piper.cmake b/cmake/espeak-ng-for-piper.cmake
@@ -13,7 +13,6 @@ function(download_espeak_ng_for_piper)
   set(USE_SPEECHPLAYER OFF CACHE BOOL "" FORCE)
   set(EXTRA_cmn ON CACHE BOOL "" FORCE)
   set(EXTRA_ru ON CACHE BOOL "" FORCE)
-  # set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64 ")
 
   # If you don't have access to the Internet,
   # please pre-download kaldi-decoder