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

fixed stuff

Browse Source
This commit is contained in:
WolverinDEV 2018-11-17 17:16:40 +01:00
parent 61dc8a1e07
commit 2e019525d3
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TeaSpeak

@ -1 +1 @@
Subproject commit fcac3d48bb5695613d28b1f545bd13c94a84f948 Subproject commit 206a1fd8337099f6c51c3f4bb61d8a71f407d2f7

2
build_teaspeak.sh
View File

@ -5,7 +5,7 @@ fi
mkdir build && cd build mkdir build && cd build
echo "Build type: ${TEASPEAK_BUILD_TYPE}" echo "Build type: ${TEASPEAK_BUILD_TYPE}"
cmake .. -DCMAKE_BUILD_TYPE="${TEASPEAK_BUILD_TYPE}" -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 .. -DCMAKE_BUILD_TYPE="${TEASPEAK_BUILD_TYPE}" -DCMAKE_CXX_FLAGS=" ${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
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Failed to run CMAKE project" echo "Failed to run CMAKE project"
exit 1 exit 1

2
libraries/DataPipes

@ -1 +1 @@
Subproject commit 2c7a0f6a6303164b39624baee5980c736e0f92fb Subproject commit 277bbe14f87399aabe5f67e7bc4cb986e974bb09

2
libraries/build_boringssl.sh
View File

@ -15,4 +15,4 @@ cd build
sudo apt-get install golang-go sudo apt-get install golang-go
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} 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} make ${CMAKE_MAKE_OPTIONS}
#sudo make install sudo make install

3
libraries/build_jemalloc.sh
View File

@ -31,6 +31,7 @@ if [ $? -ne 0 ]; then
echo "Failed to build jemalloc" echo "Failed to build jemalloc"
exit 1 exit 1
fi fi
sudo make install &>/dev/null sudo make install &>/dev/null
if [ $? -ne 0 ]; then #Workaround because the install fails if [ $? -ne 0 ]; then #Workaround because the install fails
exit 0 exit 0
@ -39,4 +40,4 @@ fi
make -j 12 LIBS="-pthread -static-libgcc -static-libstdc++" CFLAGS="-fPIC" CXXFLAGS="-fPIC" #make -j 12 LIBS="-pthread -static-libgcc -static-libstdc++" CFLAGS="-fPIC" CXXFLAGS="-fPIC"

2
libraries/build_protobuf.sh
View File

@ -4,4 +4,4 @@ cd build
cmake ../cmake/ -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} cmake ../cmake/ -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
make ${CMAKE_MAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS}
sudo make install sudo make install
sudo ldconfig #sudo ldconfig