From 65ed23b900bcecb8d8be103d85e5cc88379a13e9 Mon Sep 17 00:00:00 2001 From: amass <168062547@qq.com> Date: Fri, 2 May 2025 17:16:18 +0800 Subject: [PATCH] update. --- CMakeLists.txt | 11 ++++++----- Main/CMakeLists.txt | 2 +- resources/build.sh | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f32551d..18a8e54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,18 +10,18 @@ option(CROSS_BUILD "build for embeded product." ON) if(CROSS_BUILD) set(Libraries_ROOT /opt/aarch64-v01c01-linux-gnu-gcc/lib) set(OpenCV_DIR ${Libraries_ROOT}/opencv-4.11.0/lib/cmake/opencv4) - set(LibDataChannel_DIR ${Libraries_ROOT}/libdatachannel-0.22.5/lib/cmake/LibDataChannel) - set(OPENSSL_ROOT_DIR ${Libraries_ROOT}/openssl-3.4.1) + set(LibDataChannel_DIR ${Libraries_ROOT}/libdatachannel-0.22.6/lib/cmake/LibDataChannel) + set(OPENSSL_ROOT_DIR ${Libraries_ROOT}/openssl-3.5.0) set(OPENSSL_LIBRARY_DIRS ${OPENSSL_ROOT_DIR}/libs) set(SCTP_ROOT ${Libraries_ROOT}/usrsctp-0.9.5.0) - set(SCTP_LIBRARIES ${SCTP_ROOT}/lib/libusrsctp.so) + set(SCTP_LIBRARIES ${SCTP_ROOT}/lib/libusrsctp.a) else() set(Libraries_ROOT /opt/Libraries) endif() -set(BOOST_ROOT ${Libraries_ROOT}/boost_1_87_0) +set(BOOST_ROOT ${Libraries_ROOT}/boost_1_88_0) set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include) -option(Boost_USE_STATIC_LIBS OFF) +set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS log serialization) set(MbedTLS_DIR ${Libraries_ROOT}/mbedtls-3.6.2/lib/cmake/MbedTLS) @@ -40,4 +40,5 @@ include(FetchContent) FetchContent_Declare(Kylin GIT_REPOSITORY ssh://git@gitea.amass.fun:2022/amass/Kylin.git ) +set(ENABLE_ROUTER ON) FetchContent_MakeAvailable(Kylin) \ No newline at end of file diff --git a/Main/CMakeLists.txt b/Main/CMakeLists.txt index c7cdec7..39089d7 100644 --- a/Main/CMakeLists.txt +++ b/Main/CMakeLists.txt @@ -43,6 +43,6 @@ target_link_libraries(PassengerStatistics PRIVATE rw_mpp PRIVATE sensorsdk PRIVATE mk_api - PRIVATE ${OpenCV_LIBS} + PRIVATE opencv_world PRIVATE ${SCTP_LIBRARIES} ) \ No newline at end of file diff --git a/resources/build.sh b/resources/build.sh index 6a0fc08..aa94d46 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -8,7 +8,7 @@ # KexAlgorithms +diffie-hellman-group1-sha1 # HostkeyAlgorithms +ssh-dss,ssh-rsa # PubkeyAcceptedKeyTypes +ssh-dss,ssh-rsa -# Ciphers +aes128-cbc% +# Ciphers +aes128-cbc cross_compile=true TARGET_PATH="/data/sdcard/PassengerStatistics"