diff --git a/.gitmodules b/.gitmodules index f563534..3bf9343 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,3 +66,9 @@ [submodule "third_party/spdlog"] path = third_party/spdlog url = https://git.did.science/TeaSpeak/libraries/spdlog.git +[submodule "third_party\\abseil-cpp"] + path = third_party\\abseil-cpp + url = https://github.com/abseil/abseil-cpp.git +[submodule "third_party/webrtc-audio-processing"] + path = third_party/webrtc-audio-processing + url = https://github.com/WolverinDEV/webrtc-audio-processin.git diff --git a/build-helpers b/build-helpers index efd3787..e88704b 160000 --- a/build-helpers +++ b/build-helpers @@ -1 +1 @@ -Subproject commit efd37873410dbc93964479ea6498e84be43c5248 +Subproject commit e88704be626aa4ef9d8f079edc4f5075ef52172a diff --git a/client b/client index 09e3c78..9573cd5 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 09e3c78dd84ee7719d0a4dcc303ca8e5e8f7cddd +Subproject commit 9573cd53805d38c7776d47749f3deb850e14d0e3 diff --git a/shared b/shared index 7c82007..f4aaec6 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 7c82007b4e5d5c66612f349f8a810c420ef4de75 +Subproject commit f4aaec6481d07365550a993b68a7b5920bc8fa51 diff --git a/third_party/DataPipes b/third_party/DataPipes index f767d33..0ba69c4 160000 --- a/third_party/DataPipes +++ b/third_party/DataPipes @@ -1 +1 @@ -Subproject commit f767d33520881c2f44958fe9616f2965a3e19330 +Subproject commit 0ba69c4855229ee48da3bfc4d07854fcddb4fbaa diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp new file mode 160000 index 0000000..11231fe --- /dev/null +++ b/third_party/abseil-cpp @@ -0,0 +1 @@ +Subproject commit 11231fe5ae1693be41415cc5206b15394932b603 diff --git a/third_party/build.sh b/third_party/build.sh index 2093caa..7419cd9 100755 --- a/third_party/build.sh +++ b/third_party/build.sh @@ -60,7 +60,8 @@ function exec_script_external() { echo "" } - +exec_script_external build_abseil.sh abseil-cpp +exec_script_external build_webrtc_audio_processing.sh webrtc-audio-processing "abseil_library=$(pwd)/abseil-cpp" exec_script_external build_rnnoise.sh rnnoise exec_script_external build_libevent.sh libevent exec_script_external build_datapipes.sh DataPipes diff --git a/third_party/build_soxr.sh b/third_party/build_soxr.sh new file mode 100644 index 0000000..6c9a527 --- /dev/null +++ b/third_party/build_soxr.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +[[ -z "${build_helper_file}" ]] && { + echo "Missing build helper file. Please define \"build_helper_file\"" + exit 1 +} +source ${build_helper_file} +[[ $build_helpers_defined -ne 1 ]] && { + echo "Failed to include build helpers." + exit 1 +} + + +library_path="soxr" +requires_rebuild ${library_path} +[[ $? -eq 0 ]] && exit 0 + +_fpic="" +[[ ${build_os_type} == "linux" ]] && _fpic="-fPIC" +cmake_build ${library_path} -DCMAKE_C_FLAGS="${_fpic}" -DBUILD_SHARED_RUNTIME=OFF -DWITH_OPENMP=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF +check_err_exit ${library_path} "Failed to build soxr!" +set_build_successful ${library_path} diff --git a/third_party/rnnoise b/third_party/rnnoise index eb3dde2..3767c2d 160000 --- a/third_party/rnnoise +++ b/third_party/rnnoise @@ -1 +1 @@ -Subproject commit eb3dde20fee65f921b0b66a7df217a91b8df5000 +Subproject commit 3767c2d4c0172464a8a5e6adf8408a9b3e9b5d6c diff --git a/third_party/webrtc-audio-processing b/third_party/webrtc-audio-processing new file mode 160000 index 0000000..be762a3 --- /dev/null +++ b/third_party/webrtc-audio-processing @@ -0,0 +1 @@ +Subproject commit be762a3d62f1670898b10406749d409cce35cac0 diff --git a/try_build.sh b/try_build.sh index fdb8cf9..3ed29df 100644 --- a/try_build.sh +++ b/try_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -#'/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/Tools/VsDevCmd.bat' -arch=amd64 -host_arch=amd64 +#'/g/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/Tools/VsDevCmd.bat' -arch=amd64 -host_arch=amd64 export build_os_type=win32