From fc9b8aea39adfd7b5add352e1ab9bf647372f130 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@mcgalaxy.de>
Date: Tue, 2 Jul 2019 13:23:50 +0200
Subject: [PATCH] Updated build files

---
 third_party/DataPipes          | 2 +-
 third_party/build_boringssl.sh | 2 +-
 third_party/build_datapipes.sh | 4 ++--
 third_party/build_tom.sh       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/third_party/DataPipes b/third_party/DataPipes
index 315f9f0..cd92046 160000
--- a/third_party/DataPipes
+++ b/third_party/DataPipes
@@ -1 +1 @@
-Subproject commit 315f9f0b8cf4119abedc338cd73e3154143b6d2e
+Subproject commit cd92046ec1a91fa6b904427afeda840fab4cc338
diff --git a/third_party/build_boringssl.sh b/third_party/build_boringssl.sh
index c2c62b1..8d542f6 100755
--- a/third_party/build_boringssl.sh
+++ b/third_party/build_boringssl.sh
@@ -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!"
diff --git a/third_party/build_datapipes.sh b/third_party/build_datapipes.sh
index 348af19..5c13be8 100755
--- a/third_party/build_datapipes.sh
+++ b/third_party/build_datapipes.sh
@@ -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}
\ No newline at end of file
diff --git a/third_party/build_tom.sh b/third_party/build_tom.sh
index 81c9030..daaf7c5 100755
--- a/third_party/build_tom.sh
+++ b/third_party/build_tom.sh
@@ -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