Updated some refs
This commit is contained in:
parent
facddce695
commit
bc24c6d91f
2
TeaDNS
2
TeaDNS
|
@ -1 +1 @@
|
|||
Subproject commit c11c87254c2836d0bca970a686406cb41dcebc0c
|
||||
Subproject commit 58c1ce1185e32617870606e9926ab415418f984b
|
2
TeaSpeak
2
TeaSpeak
|
@ -1 +1 @@
|
|||
Subproject commit 3e36d7016446a643eba08b45fb97b0e11ef9b0bb
|
||||
Subproject commit 9a5aa1d42bff393b18b6777f381b16f9112f50ad
|
|
@ -10,6 +10,15 @@ if [[ -n "$1" ]]; then
|
|||
export _build_type="Debug"
|
||||
# shellcheck disable=SC2089
|
||||
export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME=beta"
|
||||
if [[ $i_really_wanna_debug -ne 1 ]]; then
|
||||
echo "Please set the i_really_wanna_debug environment variable to one if you really want a debug build"
|
||||
exit 1
|
||||
fi
|
||||
elif [[ "$1" == "nightly" ]]; then
|
||||
echo "Initializing nightly session."
|
||||
export _build_type="RelWithDebInfo"
|
||||
# shellcheck disable=SC2089
|
||||
export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=2 -DBUILD_TYPE_NAME=nightly"
|
||||
elif [[ "$1" == "optimized" ]]; then
|
||||
echo "Initializing optimized session."
|
||||
export _build_type="RelWithDebInfo"
|
||||
|
@ -36,15 +45,22 @@ else
|
|||
_web_flag="ON"
|
||||
fi
|
||||
|
||||
crypto_library_path="$(pwd)/libraries/openssl-prebuild/${build_os_type}_${build_os_arch}/" \
|
||||
./TeaSpeak/rtclib/generate_shared_library.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
cd TeaSpeak || exit 1
|
||||
if [[ -d build ]]; then
|
||||
if [[ -d build && $teaspeak_clean_build -eq 1 ]]; then
|
||||
rm -r build
|
||||
fi
|
||||
mkdir build || exit 1
|
||||
[[ ! -d build ]] && { mkdir build || exit 1; }
|
||||
cd build || exit 1
|
||||
|
||||
echo "Build type: $_build_type"
|
||||
_command="cmake .. -DCMAKE_BUILD_TYPE=\"$_build_type\" -DCMAKE_CXX_FLAGS=\"${CXX_FLAGS}\" -DBUILD_INCLUDE_FILE=\"$_build_helper_dir/cmake/config/tearoot-server.cmake\" -DCMAKE_MODULE_PATH=\"$_build_helper_dir/cmake/\" -DDISABLE_QT=1 -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON -DCOMPILE_WEB_CLIENT=\"$_web_flag\" $TEASPEAK_DEPLOY_TYPE_SPECIFIER"
|
||||
_command="cmake .. -DCMAKE_BUILD_TYPE=\"$_build_type\" -DCMAKE_CXX_FLAGS=\"${CXX_FLAGS}\" -DBUILD_INCLUDE_FILE=\"$_build_helper_dir/cmake/config/tearoot-server.cmake\" -DCMAKE_MODULE_PATH=\"$_build_helper_dir/cmake/\" -DDISABLE_QT=1 -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON -DCOMPILE_WEB_CLIENT=\"$_web_flag\" $TEASPEAK_DEPLOY_TYPE_SPECIFIER -Dmysql_ROOT_DIR=\"`pwd`/../../../mysql-server/out\""
|
||||
echo "> $_command"
|
||||
eval $_command
|
||||
_code=$?
|
||||
|
@ -64,7 +80,7 @@ if [[ $_code -ne 0 ]]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
cmake --build "$(pwd)" --target TeaSpeakServer -- -j 12; _code=$?
|
||||
cmake --build "$(pwd)" --target TeaSpeakServer -- -j 6; _code=$?
|
||||
if [[ $_code -ne 0 ]]; then
|
||||
echo "Failed to build server ($_code)"
|
||||
exit 1
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 2c1dbc03447cedd240a3bd6e94dcb87ae91807ff
|
||||
Subproject commit ddbb9ab66f673e85225c81d8a8205f0476e6d9c8
|
|
@ -1 +1 @@
|
|||
Subproject commit 3396416fab69945f420f31dea30850806e199984
|
||||
Subproject commit b4277aac2ecf8189004984cab91a759d9d85b4dc
|
Loading…
Reference in New Issue