From 6775d0d9e59802cc64720cfa0d8ae27bc6b3ee9a Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 8 Feb 2020 16:51:25 +0100 Subject: [PATCH] Updated revs --- .gitmodules | 3 +++ build-helpers | 2 +- client | 2 +- scripts | 1 + shared | 2 +- third_party/build.sh | 1 + third_party/build_soundio.sh | 23 +++++++++++++++++++++++ third_party/build_threadpool.sh | 1 + third_party/soundio | 1 + 9 files changed, 33 insertions(+), 3 deletions(-) create mode 160000 scripts create mode 100755 third_party/build_soundio.sh create mode 160000 third_party/soundio diff --git a/.gitmodules b/.gitmodules index 1e065b9..72430a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -78,3 +78,6 @@ [submodule "third_party/CXXTerminal"] path = third_party/CXXTerminal url = https://github.com/WolverinDEV/CXXTerminal.git +[submodule "third_party/soundio"] + path = third_party/soundio + url = https://github.com/WolverinDEV/libsoundio.git diff --git a/build-helpers b/build-helpers index c212df4..4e3b448 160000 --- a/build-helpers +++ b/build-helpers @@ -1 +1 @@ -Subproject commit c212df42345816ea0e73cd466718f75d9926c4a2 +Subproject commit 4e3b4489a7031067fbceaf1813c00e5f23658383 diff --git a/client b/client index 25173d5..411778f 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 25173d57451d2e261cb149e43753b20cb9dbaca6 +Subproject commit 411778f932bc3da08e8ebaaf99b4605cddec4208 diff --git a/scripts b/scripts new file mode 160000 index 0000000..0b83e74 --- /dev/null +++ b/scripts @@ -0,0 +1 @@ +Subproject commit 0b83e74e2df4b084d256ea3cea0be64e01ef6da3 diff --git a/shared b/shared index 3f57ad4..dca5bf1 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 3f57ad4678dd1ef1c72a066cc4fdd7bedb84c172 +Subproject commit dca5bf1ce814ecfb63ebef21e579b9dc2781cbbc diff --git a/third_party/build.sh b/third_party/build.sh index a41178e..8665053 100755 --- a/third_party/build.sh +++ b/third_party/build.sh @@ -45,6 +45,7 @@ exec_script build_unbound.sh exec_script build_spdlog.sh exec_script build_stringvariable.sh exec_script build_threadpool.sh +exec_script build_soundio.sh exec_script build_tom.sh exec_script build_yaml.sh [[ ${build_os_type} != "win32" ]] && exec_script build_jemalloc.sh #Not required for TeaClient diff --git a/third_party/build_soundio.sh b/third_party/build_soundio.sh new file mode 100755 index 0000000..270c969 --- /dev/null +++ b/third_party/build_soundio.sh @@ -0,0 +1,23 @@ +#!/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="soundio" +requires_rebuild ${library_path} +[[ $? -eq 0 ]] && exit 0 + +_fpic="" +[[ ${build_os_type} == "linux" ]] && _fpic="-fPIC" + +cmake_build ${library_path} -DCMAKE_C_FLAGS="${_fpic} -I../../boringssl/include/" -DBUILD_EXAMPLE_PROGRAMS=OFF -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE="Release" +check_err_exit ${library_path} "Failed to build libsoundio!" +set_build_successful ${library_path} diff --git a/third_party/build_threadpool.sh b/third_party/build_threadpool.sh index a75ca31..d5ad58f 100755 --- a/third_party/build_threadpool.sh +++ b/third_party/build_threadpool.sh @@ -20,3 +20,4 @@ _cmake_options="" cmake_build ${library_path} -DCMAKE_BUILD_TYPE=Debug ${_cmake_options} check_err_exit ${library_path} "Failed to build Thread-Pool!" set_build_successful ${library_path} + diff --git a/third_party/soundio b/third_party/soundio new file mode 160000 index 0000000..8bc42aa --- /dev/null +++ b/third_party/soundio @@ -0,0 +1 @@ +Subproject commit 8bc42aa6ff946e995f8d92687499341c376b1105