From a7b7b5ca8a36c39bb6694405c54fa691a2954c79 Mon Sep 17 00:00:00 2001 From: wawanala Date: Thu, 23 Jan 2025 21:38:24 +0800 Subject: [PATCH] fix:HDF_LIBRARY_DIR for 64bits Signed-off-by: wawanala --- framework/core/host/src/hdf_load_vdi.c | 4 ---- interfaces/inner_api/utils/hdf_base.h | 9 ++++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/framework/core/host/src/hdf_load_vdi.c b/framework/core/host/src/hdf_load_vdi.c index 7b7068100..34dd50902 100644 --- a/framework/core/host/src/hdf_load_vdi.c +++ b/framework/core/host/src/hdf_load_vdi.c @@ -15,11 +15,7 @@ #define HDF_LOG_TAG dev_load_vdi -#ifdef __ARCH64__ -#define VDI_PATH HDF_LIBRARY_DIR"64/" -#else #define VDI_PATH HDF_LIBRARY_DIR"/" -#endif struct HdfVdiObject *HdfLoadVdi(const char *libName) { diff --git a/interfaces/inner_api/utils/hdf_base.h b/interfaces/inner_api/utils/hdf_base.h index 165b4b995..946f34e7d 100644 --- a/interfaces/inner_api/utils/hdf_base.h +++ b/interfaces/inner_api/utils/hdf_base.h @@ -97,11 +97,6 @@ typedef enum { */ #define HDF_LIBRARY_FULL_PATH(x) "/usr/lib/" x ".so" -/** - * @brief Declares the directory of the HDF module library. - */ -#define HDF_LIBRARY_DIR "/usr/lib" - /** * @brief Declares the directory of the HDF module configuration files. */ @@ -134,7 +129,11 @@ typedef enum { /** * @brief Declares the directory of the HDF module library. */ +#if (defined(__aarch64__) || defined(__x86_64__)) +#define HDF_LIBRARY_DIR "/vendor/lib64" +#else #define HDF_LIBRARY_DIR "/vendor/lib" +#endif /** * @brief Declares the directory of the HDF module configuration files. -- Gitee