From ea5b4f0ac53fbafbb0f30b5b66e05b77e6916bc8 Mon Sep 17 00:00:00 2001 From: SikongJueluo Date: Sat, 30 Nov 2024 18:56:55 +0800 Subject: [PATCH] fix build error --- .devcontainer/Dockerfile | 0 .devcontainer/devcontainer.json | 0 .gitignore | 0 CCPP.nix | 16 ++++++++-------- Hi3516_SDK.lua | 0 src/isp/eb3516_video.c | 0 src/isp/eb3516_video.h | 0 src/log.conf | 0 src/main.cpp | 8 ++++---- src/my_common.h | 0 src/nnie/eb3516_nnie.c | 0 src/nnie/eb3516_nnie.h | 0 src/nnie/sample_svp_nnie_software.c | 0 src/nnie/sample_svp_nnie_software.h | 0 xmake.lua | 19 +++++++++++-------- 15 files changed, 23 insertions(+), 20 deletions(-) mode change 100644 => 100755 .devcontainer/Dockerfile mode change 100644 => 100755 .devcontainer/devcontainer.json mode change 100644 => 100755 .gitignore mode change 100644 => 100755 Hi3516_SDK.lua mode change 100644 => 100755 src/isp/eb3516_video.c mode change 100644 => 100755 src/isp/eb3516_video.h mode change 100644 => 100755 src/log.conf mode change 100644 => 100755 src/main.cpp mode change 100644 => 100755 src/my_common.h mode change 100644 => 100755 src/nnie/eb3516_nnie.c mode change 100644 => 100755 src/nnie/eb3516_nnie.h mode change 100644 => 100755 src/nnie/sample_svp_nnie_software.c mode change 100644 => 100755 src/nnie/sample_svp_nnie_software.h mode change 100644 => 100755 xmake.lua diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile old mode 100644 new mode 100755 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CCPP.nix b/CCPP.nix index 9ffce28..b230216 100644 --- a/CCPP.nix +++ b/CCPP.nix @@ -19,14 +19,14 @@ # Enable languages support # languages.cplusplus.enable = true; - env = { - NIX_LD_LIBRARY_PATH = with pkgs; - lib.makeLibraryPath [ - # stdenv_32bit.cc.cc - glibc_multi - ]; - NIX_LD = with pkgs; lib.fileContents "${stdenv_32bit.cc}/nix-support/dynamic-linker"; - }; + # env = { + # NIX_LD_LIBRARY_PATH = with pkgs; + # lib.makeLibraryPath [ + # stdenv_32bit.cc.cc + # glibc_multi + # ]; + # NIX_LD = with pkgs; lib.fileContents "${stdenv_32bit.cc}/nix-support/dynamic-linker"; + # }; # When enter shell, exec ... enterShell = '' diff --git a/Hi3516_SDK.lua b/Hi3516_SDK.lua old mode 100644 new mode 100755 diff --git a/src/isp/eb3516_video.c b/src/isp/eb3516_video.c old mode 100644 new mode 100755 diff --git a/src/isp/eb3516_video.h b/src/isp/eb3516_video.h old mode 100644 new mode 100755 diff --git a/src/log.conf b/src/log.conf old mode 100644 new mode 100755 diff --git a/src/main.cpp b/src/main.cpp old mode 100644 new mode 100755 index 06a1bea..8503480 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,10 +36,10 @@ int main(int argc, char** argv) { zlog_warn(log, "Can't Create log dir FOR %s", file_error.message().c_str()); } - eb3516VideoInit(); - eb3516VideoStart(); - // eb3516Yolov3Init("./coco_yolov3_detect.wk", "./dog_bike_car_416x416.bgr"); - // eb3516Yolov3Exit(); + // eb3516VideoInit(); + // eb3516VideoStart(); + eb3516Yolov3Init("./coco_yolov3_detect.wk", "./dog_bike_car_416x416.bgr"); + eb3516Yolov3Exit(); zlog_fini(); diff --git a/src/my_common.h b/src/my_common.h old mode 100644 new mode 100755 diff --git a/src/nnie/eb3516_nnie.c b/src/nnie/eb3516_nnie.c old mode 100644 new mode 100755 diff --git a/src/nnie/eb3516_nnie.h b/src/nnie/eb3516_nnie.h old mode 100644 new mode 100755 diff --git a/src/nnie/sample_svp_nnie_software.c b/src/nnie/sample_svp_nnie_software.c old mode 100644 new mode 100755 diff --git a/src/nnie/sample_svp_nnie_software.h b/src/nnie/sample_svp_nnie_software.h old mode 100644 new mode 100755 diff --git a/xmake.lua b/xmake.lua old mode 100644 new mode 100755 index e419a96..7662634 --- a/xmake.lua +++ b/xmake.lua @@ -1,18 +1,21 @@ add_rules("mode.debug", "mode.release") includes("Hi3516_SDK.lua") +--- Add Cross Compile Toolchain +toolchain("arm-himix200-linux") + set_kind("standalone") + + set_sdkdir("/home/sikongjueluo/Projects/CatFeeder/arm-himix200-linux") +toolchain_end() + --- Set toolchain and C/C++ standard --- set_config("sdk", "$(projectdir)/arm-himix200-linux") --- set_config("bin", "$(projectdir)/arm-himix200-linux/bin") --- set_config("cross", "arm-himix200-linux-") --- set_config("linkdirs", "$(projectdir)/arm-himix200-linux/arm-linux-gnueabi/lib") --- set_config("includedirs", "$(projectdir)/arm-himix200-linux/arm-linux-gnueabi/include") -set_config("sdk", "/opt/hisi-linux/x86-arm/arm-himix200-linux/") -set_config("plat", "cross") +-- set_config("sdk", "/opt/hisi-linux/x86-arm/arm-himix200-linux/") +set_toolchains("arm-himix200-linux") +set_plat("cross") set_languages("c11", "c++14") --- Add requires and dependencies -add_requires("zlog 1.2.17") +add_requires("zlog 1.2.17", {system = false}) target("ISP") set_kind("static")