diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index d4a4ffe..0468c4c 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -5,7 +5,8 @@ "includePath": [ "${workspaceFolder}/**", "${workspaceFolder}/3rdparty/ds_pedestrian_mot_hisi/include", - "/opt/Libraries/boost_1_84_0/include", + "/opt/Libraries/boost_1_86_0/include", + "/opt/Libraries/libdatachannel-0.22.4", "/opt/aarch64-v01c01-linux-gnu-gcc/lib/ZLMediaKit/include", "/opt/aarch64-v01c01-linux-gnu-gcc/lib/LeakTracer/include", "build/_deps/kylin-src/Universal" diff --git a/CMakeLists.txt b/CMakeLists.txt index 02e6653..f47be12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,11 +17,13 @@ endif() set(OPENSSL_INCLUDE_DIR ${OPENSSL_ROOT_DIR}/include) set(OPENSSL_LIBRARIES ssl crypto) -set(BOOST_ROOT ${Libraries_ROOT}/boost_1_84_0) +set(BOOST_ROOT ${Libraries_ROOT}/boost_1_86_0) set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include) option(Boost_USE_STATIC_LIBS OFF) find_package(Boost REQUIRED COMPONENTS log serialization) +set(MbedTLS_DIR ${Libraries_ROOT}/mbedtls-3.6.2/lib/cmake/MbedTLS) + set(ZLMediaKit_ROOT /opt/aarch64-v01c01-linux-gnu-gcc/lib/ZLMediaKit) set(ZLMediaKit_INCLUDE_DIR ${ZLMediaKit_ROOT}/include) set(ZLMediaKit_LIBRARY_DIRS ${ZLMediaKit_ROOT}/lib) diff --git a/Tools/LeakTracer/main.cpp b/Tools/LeakTracer/main.cpp index 6f5d33b..b53f74c 100644 --- a/Tools/LeakTracer/main.cpp +++ b/Tools/LeakTracer/main.cpp @@ -34,7 +34,7 @@ class Test { int main(int argc, char const *argv[]) { LOG(info) << "hello world."; - MemoryAllocationStackTracer::instance()->start(); + MemoryAllocationStackTracer::instance()->start(".", "test", std::chrono::seconds(1)); auto a = new Test(); make_memory_leak(); diff --git a/resources/build.sh b/resources/build.sh index a3411c9..e4edf3f 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -4,7 +4,7 @@ TARGET_IP="192.168.3.220" TARGET_PATH="/data/sdcard/PassengerStatistics" base_path=$(pwd) libraries_root="/opt/Libraries" -if [[ $base_path == /home/* ]]; then +if [[ $base_path == /home/* || $base_path == /root/* ]]; then build_path=${base_path}/build else build_path=/tmp/build