From 13c41021d68fa0bbade7a23936e02137a3a3efea Mon Sep 17 00:00:00 2001 From: dianjixz <18637716021@163.com> Date: Thu, 12 Dec 2024 11:11:38 +0800 Subject: [PATCH] [update] ax_msp --- .gitignore | 3 ++- ext_components/ax_msp/SConstruct | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9ec37dd..cb65ec9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .vscode/settings.json -projects/core135_llm_product_test_ui \ No newline at end of file +projects/core135_llm_product_test_ui +projects/imx678_test \ No newline at end of file diff --git a/ext_components/ax_msp/SConstruct b/ext_components/ax_msp/SConstruct index 82b6590..7e73e77 100644 --- a/ext_components/ax_msp/SConstruct +++ b/ext_components/ax_msp/SConstruct @@ -17,14 +17,18 @@ if 'CONFIG_AX_620E_MSP_ENABLED' in os.environ: LDFLAGS=[] LINK_SEARCH_PATH=[] - INCLUDE += [os.path.join(MSP_PATH, 'out/arm64_glibc/include'), os.path.join(MSP_PATH, 'sample/common')] + env["MSP_PATH"] = MSP_PATH + INCLUDE += [os.path.join(MSP_PATH, 'out/arm64_glibc/include'), os.path.join(MSP_PATH, 'sample'), os.path.join(MSP_PATH, 'sample/common'), os.path.join(MSP_PATH, 'sample/rtsp')] LINK_SEARCH_PATH += [os.path.join(MSP_PATH, 'out/arm64_glibc/lib')] REQUIREMENTS += ['dl', 'm', 'pthread'] - third_party = ['cmdline','drm','faac','fdk-aac','ffmpeg','libsamplerate','live','mp4','opencv','openssl','optee','opus','swupdate','tinyalsa'] + third_party = ['drm','faac','fdk-aac','ffmpeg','libsamplerate','mp4','opencv','opus','tinyalsa'] for dirn in third_party: INCLUDE.append(os.path.join(MSP_PATH,'third-party',dirn,'include')) LINK_SEARCH_PATH.append(os.path.join(MSP_PATH,'third-party',dirn,'lib/arm64/glibc')) - + INCLUDE.append(os.path.join(MSP_PATH,'third-party/live/out/arm64/glibc/include')) + LINK_SEARCH_PATH.append(os.path.join(MSP_PATH,'third-party/live/out/arm64/glibc/lib')) + INCLUDE.append(os.path.join(MSP_PATH,'third-party/openssl/arm64/include')) + LINK_SEARCH_PATH.append(os.path.join(MSP_PATH,'third-party/openssl/arm64/glibc/lib')) LINK_SEARCH_PATH.append(os.path.join(MSP_PATH,'app/lib')) env['COMPONENTS'].append({'target':os.path.basename(env['component_dir']),