updates

build_teaspeak.sh

@@ -8,3 +8,17 @@ cmake .. -DCMAKE_CXX_FLAGS="-I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -
 cmake --build `pwd` --target ProviderFFMpeg -- -j 12
 cmake --build `pwd` --target ProviderYT -- -j 12
 cmake --build `pwd` --target TeaSpeakServer -- -j 12
+
+${CXX_FLAGS}
+${C_FLAGS}
+
+#CMake specific
+${CMAKE_OPTIONS}
+${CMAKE_MAKE_OPTIONS}
+
+#Make specific (without cmake)
+${MAKE_OPTIONS}
+
+
+CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS}"
+CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}

libraries/build_boringssl.sh

@@ -13,6 +13,6 @@ if [ $? -ne 0 ]; then
 fi
 cd build
 sudo apt-get install golang-go
-cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release"
+cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 #sudo make install

libraries/build_breakpad.sh

@@ -2,5 +2,5 @@ cd breakpad/
 git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
 cd build
 ../configure
-make CXXFLAGS="-std=c++11 -I../../boringssl/include/"
+make CXXFLAGS="-std=c++11 -I../../boringssl/include/ ${CXX_FLAGS}" CFLAGS="${C_FLAGS}" ${MAKE_OPTIONS}
 sudo make install

libraries/build_cxxterminal.sh

@@ -1,6 +1,6 @@
 cd CXXTerminal/libraries/
 ./build_event.sh #TODO test status!
 cd ../build/
-cmake ..
+cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_datapipes.sh

@@ -2,6 +2,6 @@ cd DataPipes/
 sudo apt-get install libnice-dev
 ./build_usrsctp.sh
 cd build
-cmake .. -DCMAKE_CXX_FLAGS="-I../../boringssl/include/ -DUSE_BORINGSSL -static-libgcc -static-libstdc++" -DBUILD_TESTS=OFF
+cmake .. -DCMAKE_CXX_FLAGS="-I../../boringssl/include/ -DUSE_BORINGSSL -static-libgcc -static-libstdc++ ${CXX_FLAGS}" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_ed25519.sh

@@ -1,4 +1,4 @@
 cd ed25519/build/
-cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/"
+cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_event.sh

@@ -1,4 +1,4 @@
 cd event/build/
-cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON
+cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ ${C_FLAGS}" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_jsoncpp.sh

@@ -1,4 +1,4 @@
 cd jsoncpp/build
-cmake ..
+cmake .. -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12 CXX_FLAGS="-std=c++11 -fPIC"
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_mysqlconnector.sh

@@ -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
 fi
 cd build
-cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/"
+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}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_opus.sh

@@ -2,5 +2,5 @@ cd opus
 ./autogen.sh
 cd build
 ../configure
-make
+make -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${MAKE_OPTIONS}
 sudo make install

libraries/build_protobuf.sh

@@ -6,7 +6,7 @@ fi
 ./autogen.sh
 cd build
 ../configure
-make
+make -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${MAKE_OPTIONS}
 #make check
 sudo make install
 sudo ldconfig 

libraries/build_spdlog.sh

@@ -1,4 +1,4 @@
 cd spdlog/build/
-cmake ..
+cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_stringvariable.sh

@@ -1,4 +1,4 @@
 cd StringVariable/build/
-cmake ..
+cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_threadpool.sh

@@ -1,4 +1,4 @@
 cd Thread-Pool/build/
-cmake ..
+cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install

libraries/build_tom.sh

@@ -1,6 +1,6 @@
 cd tommath/build
-cmake ..
+cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install
 cd ../../tomcrypt/
 chmod +x create_build.sh && ./create_build.sh

libraries/build_yaml.sh

@@ -1,4 +1,4 @@
 cd yaml-cpp/build/
-cmake .. -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release
+cmake .. -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
-make -j 12 CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -std=c++11 -fPIC"
+make ${CMAKE_MAKE_OPTIONS}
 sudo make install