Updated some revs
This commit is contained in:
WolverinDEV
parent
0cbd06403c
commit
38c8c7a377
@ -1 +1 @@
|
|||||||
Subproject commit c212df42345816ea0e73cd466718f75d9926c4a2
|
Subproject commit eb1a95318b358937e69ac6c8eadbfefd4ce21807
|
||||||
2
client
2
client
@ -1 +1 @@
|
|||||||
Subproject commit 1a71df9a8a3d2979a383d8bbdb651c584586dc5b
|
Subproject commit 6393d79f54a1a13300c5117bd3eecd44b909ecc3
|
||||||
2
shared
2
shared
@ -1 +1 @@
|
|||||||
Subproject commit 3f57ad4678dd1ef1c72a066cc4fdd7bedb84c172
|
Subproject commit 65dad8e9cb0e198688f68e49ea0f5def2113b4ae
|
||||||
174
third_party/build.sh
vendored
174
third_party/build.sh
vendored
@ -1,87 +1,87 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Enter third_party/ directory
|
# Enter third_party/ directory
|
||||||
cd $(dirname $0)
|
cd $(dirname $0)
|
||||||
|
|
||||||
export build_helper_file="../build-helpers/build_helper.sh"
|
export build_helper_file="../build-helpers/build_helper.sh"
|
||||||
build_helper_scripts="../build-helpers/libraries"
|
build_helper_scripts="../build-helpers/libraries"
|
||||||
|
|
||||||
source ${build_helper_file}
|
source ${build_helper_file}
|
||||||
[[ $build_helpers_defined -ne 1 ]] && {
|
[[ $build_helpers_defined -ne 1 ]] && {
|
||||||
echo "Failed to include build helpers."
|
echo "Failed to include build helpers."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
[[ -z "${build_os_type}" ]] && {
|
[[ -z "${build_os_type}" ]] && {
|
||||||
echo "Missing build os type. Using \"linux\""
|
echo "Missing build os type. Using \"linux\""
|
||||||
export build_os_type="linux"
|
export build_os_type="linux"
|
||||||
}
|
}
|
||||||
|
|
||||||
[[ -z "${build_os_arch}" ]] && {
|
[[ -z "${build_os_arch}" ]] && {
|
||||||
echo "Missing build os arch. Using \"amd64\""
|
echo "Missing build os arch. Using \"amd64\""
|
||||||
export build_os_arch="amd64"
|
export build_os_arch="amd64"
|
||||||
}
|
}
|
||||||
|
|
||||||
begin_task "build_third_party" "Building libraries"
|
begin_task "build_third_party" "Building libraries"
|
||||||
|
|
||||||
function exec_script() {
|
function exec_script() {
|
||||||
name=$(echo "$1" | sed -n -E 's:^build_(.*)\.sh:\1:p')
|
name=$(echo "$1" | sed -n -E 's:^build_(.*)\.sh:\1:p')
|
||||||
begin_task "build_$name" "Building $name"
|
begin_task "build_$name" "Building $name"
|
||||||
|
|
||||||
echo -e "Building library with script $color_green${1}$color_normal"
|
echo -e "Building library with script $color_green${1}$color_normal"
|
||||||
./${1}
|
./${1}
|
||||||
_code=$?
|
_code=$?
|
||||||
if [[ $_code -ne 0 ]]; then
|
if [[ $_code -ne 0 ]]; then
|
||||||
echo "Failed to build library $name. Status code: $_code"
|
echo "Failed to build library $name. Status code: $_code"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Log the result
|
#Log the result
|
||||||
end_task "build_$name" "Finished $name"
|
end_task "build_$name" "Finished $name"
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function exec_script_external() {
|
function exec_script_external() {
|
||||||
name=$(echo "$1" | sed -n -E 's:^build_(.*)\.sh:\1:p')
|
name=$(echo "$1" | sed -n -E 's:^build_(.*)\.sh:\1:p')
|
||||||
begin_task "build_$name" "Building $name"
|
begin_task "build_$name" "Building $name"
|
||||||
|
|
||||||
echo -e "Building library with script $color_green${1}$color_normal"
|
echo -e "Building library with script $color_green${1}$color_normal"
|
||||||
_prefix="library_path=\"$2\" ${*:3}"
|
_prefix="library_path=\"$2\" ${*:3}"
|
||||||
eval $_prefix ./${build_helper_scripts}/"${1}"
|
eval $_prefix ./${build_helper_scripts}/"${1}"
|
||||||
code=$?
|
code=$?
|
||||||
if [[ $code -ne 0 ]]; then
|
if [[ $code -ne 0 ]]; then
|
||||||
echo "Failed to build library $name. Status code: $code"
|
echo "Failed to build library $name. Status code: $code"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Log the result
|
#Log the result
|
||||||
end_task "build_$name" "Finished $name"
|
end_task "build_$name" "Finished $name"
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
exec_script build_boringssl.sh
|
exec_script build_boringssl.sh
|
||||||
[[ ${build_os_type} != "win32" ]] && exec_script build_breakpad.sh #Not required for windows TeaClient
|
[[ ${build_os_type} != "win32" ]] && exec_script build_breakpad.sh #Not required for windows TeaClient
|
||||||
exec_script build_libevent.sh
|
exec_script build_libevent.sh
|
||||||
#exec_script build_cxxterminal.sh #Depends on libevent; Not required for TeaClient
|
#exec_script build_cxxterminal.sh #Depends on libevent; Not required for TeaClient
|
||||||
exec_script build_datapipes.sh
|
exec_script build_datapipes.sh
|
||||||
exec_script build_ed25519.sh
|
exec_script build_ed25519.sh
|
||||||
exec_script build_jsoncpp.sh
|
exec_script build_jsoncpp.sh
|
||||||
#exec_script build_mysqlconnector.sh
|
#exec_script build_mysqlconnector.sh
|
||||||
exec_script build_opus.sh
|
exec_script build_opus.sh
|
||||||
exec_script build_libfvad.sh
|
exec_script build_libfvad.sh
|
||||||
exec_script build_soxr.sh
|
exec_script build_soxr.sh
|
||||||
#exec_script build_portaudio.sh
|
exec_script build_portaudio.sh
|
||||||
exec_script_external build_protobuf.sh protobuf
|
exec_script_external build_protobuf.sh protobuf
|
||||||
exec_script build_unbound.sh
|
exec_script build_unbound.sh
|
||||||
exec_script build_spdlog.sh
|
exec_script build_spdlog.sh
|
||||||
exec_script build_stringvariable.sh
|
exec_script build_stringvariable.sh
|
||||||
exec_script build_threadpool.sh
|
exec_script build_threadpool.sh
|
||||||
exec_script build_soundio.sh
|
exec_script build_soundio.sh
|
||||||
exec_script build_tom.sh
|
exec_script build_tom.sh
|
||||||
exec_script build_yaml.sh
|
exec_script build_yaml.sh
|
||||||
[[ ${build_os_type} != "win32" ]] && exec_script build_jemalloc.sh #Not required for TeaClient
|
[[ ${build_os_type} != "win32" ]] && exec_script build_jemalloc.sh #Not required for TeaClient
|
||||||
|
|
||||||
#Log the result
|
#Log the result
|
||||||
end_task "build_third_party" "Build all libraries successfully"
|
end_task "build_third_party" "Build all libraries successfully"
|
||||||
|
|||||||
46
third_party/build_soundio.sh
vendored
46
third_party/build_soundio.sh
vendored
@ -1,23 +1,23 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
[[ -z "${build_helper_file}" ]] && {
|
[[ -z "${build_helper_file}" ]] && {
|
||||||
echo "Missing build helper file. Please define \"build_helper_file\""
|
echo "Missing build helper file. Please define \"build_helper_file\""
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
source ${build_helper_file}
|
source ${build_helper_file}
|
||||||
[[ $build_helpers_defined -ne 1 ]] && {
|
[[ $build_helpers_defined -ne 1 ]] && {
|
||||||
echo "Failed to include build helpers."
|
echo "Failed to include build helpers."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
library_path="soundio"
|
library_path="soundio"
|
||||||
requires_rebuild ${library_path}
|
requires_rebuild ${library_path}
|
||||||
[[ $? -eq 0 ]] && exit 0
|
[[ $? -eq 0 ]] && exit 0
|
||||||
|
|
||||||
_fpic=""
|
_fpic=""
|
||||||
[[ ${build_os_type} == "linux" ]] && _fpic="-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"
|
cmake_build ${library_path} -DBUILD_DYNAMIC_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DBUILD_EXAMPLE_PROGRAMS=OFF -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE="Debug"
|
||||||
check_err_exit ${library_path} "Failed to build libsoundio!"
|
check_err_exit ${library_path} "Failed to build libsoundio!"
|
||||||
set_build_successful ${library_path}
|
set_build_successful ${library_path}
|
||||||
|
|||||||
2
third_party/soundio
vendored
2
third_party/soundio
vendored
@ -1 +1 @@
|
|||||||
Subproject commit ad7b5a12362391a15c1b2e85f3761220fc8c5014
|
Subproject commit 9f9c7cce9cc899b7632ee03183d8239efdf92322
|
||||||
Loading…
x
Reference in New Issue
Block a user