several fixes

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
+1 -1
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 -2
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
+1 -1
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