From a342a4d941eec35547a39e7b7cd6f47a857d16c4 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Fri, 5 Jul 2019 21:22:51 +0200 Subject: [PATCH] Fixed libfvad --- client | 2 +- shared | 2 +- third_party/build.sh | 1 + third_party/build_libfvad.sh | 13 +++++++++++++ third_party/{build_fvad.txt => build_libfvad.txt} | 0 5 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 third_party/build_libfvad.sh rename third_party/{build_fvad.txt => build_libfvad.txt} (100%) diff --git a/client b/client index 3807c26..2ac12a7 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 3807c26d609c85939fe9073112d22ec9880b66a6 +Subproject commit 2ac12a77b86c3637d29826f29ac51c70e361582d diff --git a/shared b/shared index 29bd5e5..5606fc3 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 29bd5e55c4c62c0412560edef0467957b5075da8 +Subproject commit 5606fc3d8f9ba4e489cbf2d7918b33349114583c diff --git a/third_party/build.sh b/third_party/build.sh index 2fec67f..38c819e 100755 --- a/third_party/build.sh +++ b/third_party/build.sh @@ -31,6 +31,7 @@ exec_script build_ed25519.sh exec_script build_jsoncpp.sh #exec_script build_mysqlconnector.sh exec_script build_opus.sh +exec_script build_libfvad.sh exec_script build_soxr.sh exec_script build_portaudio.sh exec_script build_protobuf.sh diff --git a/third_party/build_libfvad.sh b/third_party/build_libfvad.sh new file mode 100755 index 0000000..169e5b8 --- /dev/null +++ b/third_party/build_libfvad.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +source ../scripts/build_helper.sh + +library_path="libfvad" +requires_rebuild ${library_path} +[[ $? -eq 0 ]] && exit 0 + +_fpic="" +[[ ${build_os_type} == "linux" ]] && _fpic="-fPIC" +cmake_build ${library_path} -DCMAKE_C_FLAGS="${_fpic}" -DBUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="${_fpic}" -DBUILD_TESTS=OFF -DBUILD_SHARED=OFF -DBUILD_STATIC=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release +check_err_exit ${library_path} "Failed to build ed25519!" +set_build_successful ${library_path} \ No newline at end of file diff --git a/third_party/build_fvad.txt b/third_party/build_libfvad.txt similarity index 100% rename from third_party/build_fvad.txt rename to third_party/build_libfvad.txt