diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..07daf0b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +TeaWeb diff --git a/Jenkinsfile b/Jenkinsfile index d396c4a..5979910 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -179,6 +179,7 @@ pipeline { environment { CMAKE_BUILD_TYPE="RelWithDebInfo" /* we build out libraries every time in release mode! (Performance improve) */ + BUILD_ARCH_TARGET=x86 } steps { diff --git a/TeaSpeak b/TeaSpeak index 86b682d..5e728ee 160000 --- a/TeaSpeak +++ b/TeaSpeak @@ -1 +1 @@ -Subproject commit 86b682dda54ac764211f6565b89b5179129bba14 +Subproject commit 5e728ee046a457d55e867044fc6424a25b2d116f diff --git a/Web-Client b/Web-Client index a10e794..2b00136 160000 --- a/Web-Client +++ b/Web-Client @@ -1 +1 @@ -Subproject commit a10e794e3b5e98b807327bcfee321a649b0091a1 +Subproject commit 2b00136e6eb724deb0c92e643441391212f7109f diff --git a/WebClient.zip b/WebClient.zip new file mode 100644 index 0000000..3c2e856 Binary files /dev/null and b/WebClient.zip differ diff --git a/libraries/DataPipes b/libraries/DataPipes index 849fec1..1e16c47 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit 849fec151e8abb663fb1ffded6b65a70c33e595a +Subproject commit 1e16c473f8e275c1434f702512f4f8b8c0908511 diff --git a/libraries/Thread-Pool b/libraries/Thread-Pool index cc85ef1..42eae04 160000 --- a/libraries/Thread-Pool +++ b/libraries/Thread-Pool @@ -1 +1 @@ -Subproject commit cc85ef1f7c0b813a20b0eb5470006d8346d4b4d4 +Subproject commit 42eae0418931277e2c7ebd88429d4ea58ad1cb82 diff --git a/libraries/build_boringssl.sh b/libraries/build_boringssl.sh index 327266b..5193135 100755 --- a/libraries/build_boringssl.sh +++ b/libraries/build_boringssl.sh @@ -13,6 +13,12 @@ if [ $? -ne 0 ]; then fi cd build sudo apt-get install golang-go -cmake .. -D -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -fPIC" -DCMAKE_C_FLAGS="${C_FLAGS} -fPIC" -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=1 + +if [ "x86" == "${BUILD_ARCH_TARGET}" ]; then + echo "Build boring SSL in 32 bit mode!" + T32="-DCMAKE_TOOLCHAIN_FILE=../util/32-bit-toolchain.cmake" +fi + +cmake .. -D -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=1 ${T32} make ${CMAKE_MAKE_OPTIONS} #sudo make install diff --git a/libraries/build_datapipes.sh b/libraries/build_datapipes.sh index 4a71901..ef7aac2 100755 --- a/libraries/build_datapipes.sh +++ b/libraries/build_datapipes.sh @@ -4,6 +4,6 @@ sudo apt-get install libnice-dev ./build_srtp.sh ./build_sdptransform.sh cd build -cmake .. -DCrypto_ROOT_DIR="../../boringssl/" -DCRYPTO_TYPE="boringssl" -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ ${CXX_FLAGS}" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${CMAKE_OPTIONS} +cmake .. -DCrypto_ROOT_DIR="../../boringssl/" -DCRYPTO_TYPE="boringssl" -DCMAKE_CXX_FLAGS="-fPIC -static-libgcc -static-libstdc++ ${CXX_FLAGS}" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="${C_FLAGS} -fPIC" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_ed25519.sh b/libraries/build_ed25519.sh index 64cf716..aa05adc 100755 --- a/libraries/build_ed25519.sh +++ b/libraries/build_ed25519.sh @@ -1,4 +1,4 @@ cd ed25519/build/ -cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} +cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="-fPIC ${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_jemalloc.sh b/libraries/build_jemalloc.sh index a8e2575..8d23372 100755 --- a/libraries/build_jemalloc.sh +++ b/libraries/build_jemalloc.sh @@ -15,7 +15,7 @@ if ! [ -f configure ]; then fi cd build -../configure +../configure --enable-munmap if [ $? -ne 0 ]; then echo "Failed to create makefile" exit 1 diff --git a/libraries/build_tom.sh b/libraries/build_tom.sh index 34a2cd7..bf126fd 100755 --- a/libraries/build_tom.sh +++ b/libraries/build_tom.sh @@ -1,5 +1,5 @@ cd tommath/build -cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} +cmake .. -DCMAKE_CXX_FLAGS="-fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="-fPIC ${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install cd ../../tomcrypt/ diff --git a/libraries/ed25519 b/libraries/ed25519 index 98bd4f3..f810597 160000 --- a/libraries/ed25519 +++ b/libraries/ed25519 @@ -1 +1 @@ -Subproject commit 98bd4f3ec60ab1bb09b6becd7a5e1d91d35c81cd +Subproject commit f810597c6ce050233a7c499435c351d38777ef43