From 68eb8659466ab8f6f297e12c60a232d4c9518ad4 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Mon, 11 Nov 2019 22:49:38 +0100 Subject: [PATCH] Fixed DP --- libraries/DataPipes | 2 +- libraries/build_datapipes.sh | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/DataPipes b/libraries/DataPipes index 608e174..f544935 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit 608e174861af3bc8b6e2ce994371882b95ae9025 +Subproject commit f54493570a2914fd32cb2328a587ee8af0ce92e0 diff --git a/libraries/build_datapipes.sh b/libraries/build_datapipes.sh index dad08bc..885512a 100755 --- a/libraries/build_datapipes.sh +++ b/libraries/build_datapipes.sh @@ -3,7 +3,14 @@ sudo apt-get install libnice-dev ./build_usrsctp.sh ./build_srtp.sh ./build_sdptransform.sh -cd build -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} -DLIBNICE_PREBUILD_PATH="../libnice/linux_${build_os_arch}" -DGLIBC_PREBUILD_PATH="../glibc/linux_${build_os_arch}" +if [[ -d build ]]; then + rm -rf build +fi +mkdir build +cd build || { + echo "Failed to enter build dir" + exit 1 +} +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} -DLIBNICE_PREBUILD_PATH="../libnice/linux_${build_os_arch}" -DGLIBC_PREBUILD_PATH="../glibc/linux_${build_os_arch}" -DBUILD_STATIC=0 -DBUILD_SHARED=1 make ${CMAKE_MAKE_OPTIONS} sudo make install