Updated build files

This commit is contained in:
WolverinDEV 2019-07-02 13:23:50 +02:00
parent e99717cbc9
commit fc9b8aea39
4 changed files with 6 additions and 6 deletions

@ -1 +1 @@
Subproject commit 315f9f0b8cf4119abedc338cd73e3154143b6d2e
Subproject commit cd92046ec1a91fa6b904427afeda840fab4cc338

View File

@ -36,7 +36,7 @@ if [[ "x86" == "${build_os_arch}" ]]; then
T32="-DCMAKE_TOOLCHAIN_FILE=../util/32-bit-toolchain.cmake"
fi
cmake .. -DOPENSSL_NO_ASM=ON -DCMAKE_CXX_FLAGS="-Wno-error=format= -Wno-error=format-extra-args -Wno-error=misleading-indentation -Wno-error=maybe-uninitialized ${CXX_FLAGS}" -DBUILD_SHARED_LIBS=ON -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=1 ${T32}
cmake .. -DOPENSSL_NO_ASM=ON -DCMAKE_CXX_FLAGS="-Wno-error=format= -Wno-error=format-extra-args -Wno-error=misleading-indentation -Wno-error=maybe-uninitialized ${CXX_FLAGS}" -DBUILD_SHARED_LIBS=ON -DCMAKE_C_FLAGS="${C_FLAGS} -Wno-error=misleading-indentation -Wno-error=maybe-uninitialized" -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=1 ${T32}
check_err_exit ${library_path} "Failed to execute cmake!"
make ${CMAKE_MAKE_OPTIONS}
check_err_exit ${library_path} "Failed to build!"

View File

@ -13,7 +13,7 @@ dpkg-query -l libnice-dev2 &>/dev/null
if [[ $? -ne 0 ]]; then
echo "Installing libnice"
sudo apt-get update
sudo apt-get install libnice-dev
sudo apt-get install -yes --force-yes libnice-dev
else
echo "libnice already installed"
fi
@ -25,6 +25,6 @@ check_err_exit ${library_path} "Failed to build srtp!"
check_err_exit ${library_path} "Failed to build sdptransform!"
cd ..
cmake_build ${library_path} -DCrypto_ROOT_DIR="`pwd`/boringssl/" -DCRYPTO_TYPE="boringssl" -DCMAKE_CXX_FLAGS="-fPIC -static-libgcc -static-libstdc++" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="-fPIC"
cmake_build ${library_path} -DCrypto_ROOT_DIR="`pwd`/boringssl/out/${build_os_type}_${build_os_arch}" -DCRYPTO_TYPE="boringssl" -DCMAKE_CXX_FLAGS="-fPIC -static-libgcc -static-libstdc++" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="-fPIC"
check_err_exit ${library_path} "Failed to build DataPipes!"
set_build_successful ${library_path}

View File

@ -14,8 +14,8 @@ requires_rebuild ${library_path}
library_path="tomcrypt"
requires_rebuild ${library_path}
[[ $? -ne 0 ]] && {
export tommath_library="`pwd`/tommath/out/linux_amd64/libtommathStatic.a"
export tommath_include="`pwd`/tommath/out/linux_amd64/include/"
export tommath_library="`pwd`/tommath/out/${build_os_type}_${build_os_arch}/libtommathStatic.a"
export tommath_include="`pwd`/tommath/out/${build_os_type}_${build_os_arch}/include/"
cd tomcrypt/
chmod +x create_build.sh && ./create_build.sh