TeaSpeak/Server-Root
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

several fixes

Browse Source
This commit is contained in:
WolverinDEV 2018-08-09 17:43:18 +00:00
parent ec2bf1b4d6
commit ea219b0848
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TeaSpeak

@ -1 +1 @@
Subproject commit b8d071276ac0be01ff93f30a347c1f5371f04d78
Subproject commit 58d3e758b5f83c6724b5ece24b5fc672b1205ab8

2
build_teaspeak.sh
View File

@ -4,7 +4,7 @@ if [ -d build ]; then
fi
mkdir build && cd build
cmake .. -DCMAKE_CXX_FLAGS="-I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -I../../../libraries/boringssl/include/ -D_GLIBCXX_USE_CXX11_ABI=1" -DDISABLE_CUSTOM_OUTPUT=ON
cmake .. -DCMAKE_CXX_FLAGS="-I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -I../../../libraries/boringssl/include/ -D_GLIBCXX_USE_CXX11_ABI=1" -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON
cmake --build `pwd` --target ProviderFFMpeg -- -j 12
cmake --build `pwd` --target ProviderYT -- -j 12
cmake --build `pwd` --target TeaSpeakServer -- -j 12

2
libraries/Thread-Pool

@ -1 +1 @@
Subproject commit 5362de13ea91fb272437e3f761fcd3419bc7c821
Subproject commit 635c1e222e8761fed6636c9c7c794f8142b06eb8

4
libraries/build_boringssl.sh
View File

@ -5,7 +5,7 @@ if [ ! -d lib ]; then
ln -s ../build/crypto/libcrypto.so .
cd ..
fi
cat /include/openssl/opensslv.h | grep "OPENSSL_VERSION_NUMBER" &> /dev/null
cat include/openssl/opensslv.h | grep "OPENSSL_VERSION_NUMBER" &> /dev/null
if [ $? -ne 0 ]; then
echo "#if false
# define OPENSSL_VERSION_NUMBER 0x1010008fL
@ -13,6 +13,6 @@ if [ $? -ne 0 ]; then
fi
cd build
sudo apt-get install golang-go
cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
cmake .. -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
make ${CMAKE_MAKE_OPTIONS}
#sudo make install

2
libraries/build_ed25519.sh
View File

@ -1,4 +1,4 @@
cd ed25519/build/
cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS}
cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS}
make ${CMAKE_MAKE_OPTIONS}
sudo make install