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

fixed build script

Browse Source
This commit is contained in:
WolverinDEV 2019-05-28 17:49:03 +02:00
parent 3f96804cae
commit e0ab61fa60
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Web-Client Submodule

@ -0,0 +1 @@
Subproject commit 2b00136e6eb724deb0c92e643441391212f7109f

14
attach_modules.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
#The libs have no need to be attach to the master :)
cd TeaSpeak
git submodule foreach -q --recursive ' git submodule foreach -q --recursive '
echo "Updating $name"; echo "Updating $name";
BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master) BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)
@ -8,14 +10,4 @@ if [ -z ${BRANCH} ]; then
fi fi
git checkout ${BRANCH}; git checkout ${BRANCH};
echo "git pull origin ${BRANCH}" echo "git pull origin ${BRANCH}"
git pull origin ${BRANCH}' git pull origin ${BRANCH}'
git submodule foreach -q --recursive '
echo "Updating $name";
CHECKOUT=$(git config -f $toplevel/.gitmodules submodule.$name.checkout)
if [ ! -z ${CHECKOUT} ]; then
git checkout ${CHECKOUT};
echo "Checking out ${CHECKOUT} for $name"
fi
'

2
libraries/build_mysqlconnector.sh
View File

@ -11,6 +11,6 @@ if ! [ "${HEADER:0:34}" == "#if !defined(SSL_ERROR_WANT_ASYNC)" ]; then
`cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc `cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc
fi fi
cd build cd build
cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/ ${CXX_FLAGS}" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/ ${CXX_FLAGS}" -DWITH_JDBC=OFF -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
make ${CMAKE_MAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS}
sudo make install sudo make install

2
libraries/mysqlconnector

@ -1 +1 @@
Subproject commit 7abcdc88c8235f02096e21b5bcd72e8312508f61 Subproject commit c836e39f4623ae39a9701e74873e4f33f9285780