重新编译OCCT库

entry/build-profile.json5

@@ -8,10 +8,57 @@
     },
     "externalNativeOptions": {
       "path": "./src/main/cpp/CMakeLists.txt",
-      "arguments": "-DOHOS_STL=c++_shared",
+      "arguments": "-DCMAKE_BUILD_TYPE=Release -DOHOS_STL=c++_shared ",
       "cppFlags": "",
       "abiFilters": [
         "x86_64"
+      ],
+    },
+    "nativeLib":{
+      "librariesInfo": [
+        {
+          "name": "libocctrender.so",
+          "headerPath": "./src/main/cpp/include/opencascade",
+          "linkLibraries": [
+            // OCCT 核心库（按 CMake 中顺序）
+            "TKernel",
+            "TKBRep",
+            "TKOpenGles",
+            "TKMath",
+            "TKG2d",
+            "TKG3d",
+            "TKGeomBase",
+            "TKGeomAlgo",
+            "TKTopAlgo",
+            "TKMesh",
+            "TKService",
+            "TKV3d",
+            "TKXCAF",
+            "TKCAF",
+            "TKLCAF",
+            "TKCDF",
+            "TKFillet",
+            "TKDESTEP",
+            "TKShHealing",
+            "TKHLR",
+            "TKVCAF",
+            "TKBO",
+            "TKPrim",
+            "TKBool",
+            "TKDE",
+            "TKXSBase",
+            // 第三方依赖
+            "freetype",
+            "fontconfig",
+            "brotlicommon",
+            "brotlidec",
+            "brotlienc",
+            "expat",
+            "png16",
+            "bz2",
+            "z",
+          ]
+        }
       ]
     },
     "arkOptions": {

entry/src/main/cpp/CMakeLists.txt

@@ -1,80 +1,50 @@
 # the minimum version of CMake.
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.18.1)
 project(OpenCAX)
 
 set(NATIVERENDER_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 add_definitions(-DOHOS_PLATFORM)
 
-#if(DEFINED PACKAGE_FIND_FILE)
-#    include(${PACKAGE_FIND_FILE})
-#endif()
-
-# 添加NAPI头文件
+# 添加 NAPI 头文件
 include_directories(${NATIVERENDER_ROOT_PATH}
-                    ${NATIVERENDER_ROOT_PATH}/include
-                    ${NATIVERENDER_ROOT_PATH}/include/opencascade
+    ${NATIVERENDER_ROOT_PATH}/include
+    ${NATIVERENDER_ROOT_PATH}/include/opencascade
 )
 
-# OCCT库配置
+# OCCT 库目录（仅用于查找文件，不直接用于链接）
 set(OCCT_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/${OHOS_ARCH})
-set(OCCT_LIBS
-    ${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
-)
+link_directories(${OCCT_LIB_DIR})
 
+# 定义 OCCT 核心库列表
+set(OCCT_LIBS
+    TKernel TKBRep TKOpenGles TKMath TKG2d TKG3d TKGeomBase TKGeomAlgo
+    TKTopAlgo TKMesh TKService TKV3d TKXCAF TKCAF TKLCAF TKCDF TKFillet
+    TKDESTEP TKShHealing TKHLR TKVCAF TKBO TKPrim TKBool TKDE TKXSBase
+    freetype fontconfig expat z bz2 png16 brotlicommon brotlidec brotlienc
+)
 # 添加源文件
 add_library(occtrender SHARED
     napi_init.cpp
-    #Header
+    # Header
     EGLCore/EGLCore.h
     OCCTRender/OCCTRender.h
     OCCTRenderThread/OCCTRenderThread.h
-    #Cpp Src
+    # Cpp Src
     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(libuv-lib uv)
 
+# 链接系统库
 target_link_libraries(occtrender PUBLIC
-    #EGL Hilog库
+    # EGL Hilog 库
     ${EGL-lib}
     ${GLES-lib}
     ${hilog-lib}
@@ -82,5 +52,7 @@ target_link_libraries(occtrender PUBLIC
     ${libuv-lib}
     libnative_window.so
     libace_napi.z.so
+    #OCCT核心库
+    ${OCCT_LIBS}
 )
-target_link_libraries(occtrender PUBLIC ${OCCT_LIBS})
+