调整库的路径结构

entry/build-profile.json5

@@ -8,11 +8,18 @@
     },
     "externalNativeOptions": {
       "path": "./src/main/cpp/CMakeLists.txt",
-      "arguments": "",
+      "arguments": "-DOHOS_STL=c++_shared",
       "cppFlags": "",
       "abiFilters": [
         "x86_64"
       ]
+    },
+    "arkOptions": {
+      "runtimeOnly" : {
+        "packages": [
+          "libOCCTRender.so"
+        ]
+      }
     }
   },
   "buildOptionSet": [
@@ -38,7 +45,8 @@
   ],
   "targets": [
     {
-      "name": "default"
+      "name": "default",
+      "runtimeOS": "HarmonyOS"
     },
     {
       "name": "ohosTest",

entry/oh-package-lock.json5

@@ -6,13 +6,13 @@
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
-    "libocct.so@src/main/cpp/types/libocct": "libocct.so@src/main/cpp/types/libocct"
+    "libOCCTRender.so@src/main/cpp/types/libOCCTRender": "libOCCTRender.so@src/main/cpp/types/libOCCTRender"
   },
   "packages": {
-    "libocct.so@src/main/cpp/types/libocct": {
-      "name": "libocct.so",
+    "libOCCTRender.so@src/main/cpp/types/libOCCTRender": {
+      "name": "libOCCTRender.so",
       "version": "1.0.0",
-      "resolved": "src/main/cpp/types/libocct",
+      "resolved": "src/main/cpp/types/libOCCTRender",
       "registryType": "local"
     }
   }

entry/oh-package.json5

@@ -6,6 +6,6 @@
   "author": "",
   "license": "",
   "dependencies": {
-    "libocct.so": "file:./src/main/cpp/types/libocct"
+    "libOCCTRender.so": "file:./src/main/cpp/types/libOCCTRender"
   }
 }

entry/src/main/cpp/CMakeLists.txt

@@ -14,16 +14,15 @@ include_directories(${NATIVERENDER_ROOT_PATH}
                     ${NATIVERENDER_ROOT_PATH}/include)
 
 # OCCT库配置
-set(OCCT_ROOT_DIR ${CMAKE_SOURCE_DIR}/3rdparty/opencascade)
-set(OCCT_INCLUDE_DIR ${OCCT_ROOT_DIR}/include)
-set(OCCT_LIB_DIR ${OCCT_ROOT_DIR}/libs/x86_64)
+set(OCCT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/opencascade)
+set(OCCT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/${OHOS_ARCH})
 
 # 添加OCCT库
 link_directories(${OCCT_LIB_DIR})
 include_directories(${OCCT_INCLUDE_DIR})
 
 # 添加源文件
-add_library(occt SHARED
+add_library(OCCTRender SHARED
     napi_init.cpp
     #Header
     EGLCore/EGLCore.h
@@ -33,40 +32,61 @@ add_library(occt SHARED
     EGLCore/EGLCore.cpp
     OCCTRender/OCCTRender.cpp
     OCCTRenderThread/OCCTRenderThread.cpp
-)
+    )
 
 find_library(EGL-lib EGL)
 find_library(GLES-lib GLESv3)
 find_library(hilog-lib hilog_ndk.z)
 find_library(libace-lib ace_ndk.z)
-find_library(libnapi-lib ace_napi.z)
 find_library(libuv-lib uv)
 
 set(OCCT_LIBS
-    ${OCCT_LIB_DIR}/libTKernel.so
-    ${OCCT_LIB_DIR}/libTKMath.so
-    ${OCCT_LIB_DIR}/libTKGeomBase.so
-    ${OCCT_LIB_DIR}/libTKGeomAlgo.so
-    ${OCCT_LIB_DIR}/libTKTopAlgo.so
-    ${OCCT_LIB_DIR}/libTKMesh.so
-    ${OCCT_LIB_DIR}/libTKService.so
-    ${OCCT_LIB_DIR}/libTKV3d.so
-    ${OCCT_LIB_DIR}/libTKOpenGles.so
-    ${OCCT_LIB_DIR}/libTKXCAF.so
-    ${OCCT_LIB_DIR}/libTKCAF.so
-    ${OCCT_LIB_DIR}/libTKLCAF.so
-    ${OCCT_LIB_DIR}/libTKCDF.so
-    ${OCCT_LIB_DIR}/libTKFillet.so
-    ${OCCT_LIB_DIR}/libTKDESTEP.so
+    ${OCCT_LIB_DIR}/libTKernel.so.7.9
+    ${OCCT_LIB_DIR}/libTKBRep.so.7.9
+    ${OCCT_LIB_DIR}/libTKOpenGles.so.7.9
+    ${OCCT_LIB_DIR}/libTKMath.so.7.9
+    ${OCCT_LIB_DIR}/libTKG2d.so.7.9
+    ${OCCT_LIB_DIR}/libTKG3d.so.7.9
+    ${OCCT_LIB_DIR}/libTKGeomBase.so.7.9
+    ${OCCT_LIB_DIR}/libTKGeomAlgo.so.7.9
+    ${OCCT_LIB_DIR}/libTKTopAlgo.so.7.9
+    ${OCCT_LIB_DIR}/libTKMesh.so.7.9
+    ${OCCT_LIB_DIR}/libTKService.so.7.9
+    ${OCCT_LIB_DIR}/libTKV3d.so.7.9
+    ${OCCT_LIB_DIR}/libTKXCAF.so.7.9
+    ${OCCT_LIB_DIR}/libTKCAF.so.7.9
+    ${OCCT_LIB_DIR}/libTKLCAF.so.7.9
+    ${OCCT_LIB_DIR}/libTKCDF.so.7.9
+    ${OCCT_LIB_DIR}/libTKFillet.so.7.9
+    ${OCCT_LIB_DIR}/libTKDESTEP.so.7.9
+    ${OCCT_LIB_DIR}/libTKShHealing.so.7.9
+    ${OCCT_LIB_DIR}/libTKHLR.so.7.9
+    ${OCCT_LIB_DIR}/libTKVCAF.so.7.9
+    ${OCCT_LIB_DIR}/libTKBO.so.7.9
+    ${OCCT_LIB_DIR}/libTKPrim.so.7.9
+    ${OCCT_LIB_DIR}/libTKBool.so.7.9
+    ${OCCT_LIB_DIR}/libTKDE.so.7.9
+    ${OCCT_LIB_DIR}/libTKXSBase.so.7.9
+    ${OCCT_LIB_DIR}/libfreetype.so.6
+    ${OCCT_LIB_DIR}/libfontconfig.so.1
+    ${OCCT_LIB_DIR}/libexpat.so.1
+    ${OCCT_LIB_DIR}/libz.so.1
+    ${OCCT_LIB_DIR}/libbz2.so.1.0
+    ${OCCT_LIB_DIR}/libpng16.so.16
+    ${OCCT_LIB_DIR}/libbrotlicommon.so.1
+    ${OCCT_LIB_DIR}/libbrotlidec.so.1
+    ${OCCT_LIB_DIR}/libbrotlienc.so.1
 )
 
-target_link_libraries(occt PUBLIC
+target_link_libraries(OCCTRender PUBLIC
+    # OCCT核心库
+    ${OCCT_LIBS}
+    #EGL Hilog库
     ${EGL-lib}
     ${GLES-lib}
     ${hilog-lib}
     ${libace-lib}
-    ${libnapi-lib}
     ${libuv-lib}
-    # OCCT核心库
-    ${OCCT_LIBS}
-    libnative_window.so)
+    libnative_window.so
+    libace_napi.z.so
+)