diff --git a/entry/build-profile.json5 b/entry/build-profile.json5 index 94c68961..864bb3b6 100644 --- a/entry/build-profile.json5 +++ b/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": { diff --git a/entry/libs/x86_64/libTKBO.so.7.9 b/entry/libs/x86_64/libTKBO.so.7.9.3 similarity index 71% rename from entry/libs/x86_64/libTKBO.so.7.9 rename to entry/libs/x86_64/libTKBO.so.7.9.3 index ba4e361f..a5693c68 100644 Binary files a/entry/libs/x86_64/libTKBO.so.7.9 and b/entry/libs/x86_64/libTKBO.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKBRep.so.7.9 b/entry/libs/x86_64/libTKBRep.so.7.9.3 similarity index 69% rename from entry/libs/x86_64/libTKBRep.so.7.9 rename to entry/libs/x86_64/libTKBRep.so.7.9.3 index 2cc954a1..c98ddc22 100644 Binary files a/entry/libs/x86_64/libTKBRep.so.7.9 and b/entry/libs/x86_64/libTKBRep.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKBin.so.7.9 b/entry/libs/x86_64/libTKBin.so.7.9.3 similarity index 59% rename from entry/libs/x86_64/libTKBin.so.7.9 rename to entry/libs/x86_64/libTKBin.so.7.9.3 index 88a11af4..0b16e150 100644 Binary files a/entry/libs/x86_64/libTKBin.so.7.9 and b/entry/libs/x86_64/libTKBin.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKBinL.so.7.9 b/entry/libs/x86_64/libTKBinL.so.7.9.3 similarity index 58% rename from entry/libs/x86_64/libTKBinL.so.7.9 rename to entry/libs/x86_64/libTKBinL.so.7.9.3 index 71d55b87..161b676d 100644 Binary files a/entry/libs/x86_64/libTKBinL.so.7.9 and b/entry/libs/x86_64/libTKBinL.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKBinTObj.so.7.9 b/entry/libs/x86_64/libTKBinTObj.so.7.9.3 similarity index 60% rename from entry/libs/x86_64/libTKBinTObj.so.7.9 rename to entry/libs/x86_64/libTKBinTObj.so.7.9.3 index d15926d6..1b198d71 100644 Binary files a/entry/libs/x86_64/libTKBinTObj.so.7.9 and b/entry/libs/x86_64/libTKBinTObj.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKBinXCAF.so.7.9 b/entry/libs/x86_64/libTKBinXCAF.so.7.9.3 similarity index 56% rename from entry/libs/x86_64/libTKBinXCAF.so.7.9 rename to entry/libs/x86_64/libTKBinXCAF.so.7.9.3 index 785e36e9..b2446939 100644 Binary files a/entry/libs/x86_64/libTKBinXCAF.so.7.9 and b/entry/libs/x86_64/libTKBinXCAF.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKBool.so.7.9 b/entry/libs/x86_64/libTKBool.so.7.9.3 similarity index 76% rename from entry/libs/x86_64/libTKBool.so.7.9 rename to entry/libs/x86_64/libTKBool.so.7.9.3 index e123d66b..c620c0e4 100644 Binary files a/entry/libs/x86_64/libTKBool.so.7.9 and b/entry/libs/x86_64/libTKBool.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKCAF.so.7.9 b/entry/libs/x86_64/libTKCAF.so.7.9.3 similarity index 67% rename from entry/libs/x86_64/libTKCAF.so.7.9 rename to entry/libs/x86_64/libTKCAF.so.7.9.3 index 9a7073c2..4149045a 100644 Binary files a/entry/libs/x86_64/libTKCAF.so.7.9 and b/entry/libs/x86_64/libTKCAF.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKCDF.so.7.9 b/entry/libs/x86_64/libTKCDF.so.7.9.3 similarity index 62% rename from entry/libs/x86_64/libTKCDF.so.7.9 rename to entry/libs/x86_64/libTKCDF.so.7.9.3 index 7ae6d23b..cc433e1d 100644 Binary files a/entry/libs/x86_64/libTKCDF.so.7.9 and b/entry/libs/x86_64/libTKCDF.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDE.so.7.9 b/entry/libs/x86_64/libTKDE.so.7.9.3 similarity index 67% rename from entry/libs/x86_64/libTKDE.so.7.9 rename to entry/libs/x86_64/libTKDE.so.7.9.3 index 52d96cca..0558ed88 100644 Binary files a/entry/libs/x86_64/libTKDE.so.7.9 and b/entry/libs/x86_64/libTKDE.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDECascade.so.7.9 b/entry/libs/x86_64/libTKDECascade.so.7.9.3 similarity index 59% rename from entry/libs/x86_64/libTKDECascade.so.7.9 rename to entry/libs/x86_64/libTKDECascade.so.7.9.3 index 0ae0bb39..89811331 100644 Binary files a/entry/libs/x86_64/libTKDECascade.so.7.9 and b/entry/libs/x86_64/libTKDECascade.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDEGLTF.so.7.9 b/entry/libs/x86_64/libTKDEGLTF.so.7.9.3 similarity index 60% rename from entry/libs/x86_64/libTKDEGLTF.so.7.9 rename to entry/libs/x86_64/libTKDEGLTF.so.7.9.3 index af71ca35..b9f77727 100644 Binary files a/entry/libs/x86_64/libTKDEGLTF.so.7.9 and b/entry/libs/x86_64/libTKDEGLTF.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDEIGES.so.7.9 b/entry/libs/x86_64/libTKDEIGES.so.7.9.3 similarity index 70% rename from entry/libs/x86_64/libTKDEIGES.so.7.9 rename to entry/libs/x86_64/libTKDEIGES.so.7.9.3 index d032ff49..fd0b3636 100644 Binary files a/entry/libs/x86_64/libTKDEIGES.so.7.9 and b/entry/libs/x86_64/libTKDEIGES.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDEOBJ.so.7.9 b/entry/libs/x86_64/libTKDEOBJ.so.7.9.3 similarity index 63% rename from entry/libs/x86_64/libTKDEOBJ.so.7.9 rename to entry/libs/x86_64/libTKDEOBJ.so.7.9.3 index b9b96c67..8cccb9e2 100644 Binary files a/entry/libs/x86_64/libTKDEOBJ.so.7.9 and b/entry/libs/x86_64/libTKDEOBJ.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDEPLY.so.7.9 b/entry/libs/x86_64/libTKDEPLY.so.7.9.3 similarity index 62% rename from entry/libs/x86_64/libTKDEPLY.so.7.9 rename to entry/libs/x86_64/libTKDEPLY.so.7.9.3 index 872445ce..b65e667c 100644 Binary files a/entry/libs/x86_64/libTKDEPLY.so.7.9 and b/entry/libs/x86_64/libTKDEPLY.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDESTEP.so.7.9 b/entry/libs/x86_64/libTKDESTEP.so.7.9.3 similarity index 70% rename from entry/libs/x86_64/libTKDESTEP.so.7.9 rename to entry/libs/x86_64/libTKDESTEP.so.7.9.3 index 88214636..e49e3ac6 100644 Binary files a/entry/libs/x86_64/libTKDESTEP.so.7.9 and b/entry/libs/x86_64/libTKDESTEP.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDESTL.so.7.9 b/entry/libs/x86_64/libTKDESTL.so.7.9.3 similarity index 64% rename from entry/libs/x86_64/libTKDESTL.so.7.9 rename to entry/libs/x86_64/libTKDESTL.so.7.9.3 index 546212f9..255b53e5 100644 Binary files a/entry/libs/x86_64/libTKDESTL.so.7.9 and b/entry/libs/x86_64/libTKDESTL.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKDEVRML.so.7.9 b/entry/libs/x86_64/libTKDEVRML.so.7.9.3 similarity index 63% rename from entry/libs/x86_64/libTKDEVRML.so.7.9 rename to entry/libs/x86_64/libTKDEVRML.so.7.9.3 index 68900f21..12539208 100644 Binary files a/entry/libs/x86_64/libTKDEVRML.so.7.9 and b/entry/libs/x86_64/libTKDEVRML.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKFeat.so.7.9 b/entry/libs/x86_64/libTKFeat.so.7.9.3 similarity index 82% rename from entry/libs/x86_64/libTKFeat.so.7.9 rename to entry/libs/x86_64/libTKFeat.so.7.9.3 index c68d1786..3cdc4196 100644 Binary files a/entry/libs/x86_64/libTKFeat.so.7.9 and b/entry/libs/x86_64/libTKFeat.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKFillet.so.7.9 b/entry/libs/x86_64/libTKFillet.so.7.9.3 similarity index 80% rename from entry/libs/x86_64/libTKFillet.so.7.9 rename to entry/libs/x86_64/libTKFillet.so.7.9.3 index 29a2420a..55317bfc 100644 Binary files a/entry/libs/x86_64/libTKFillet.so.7.9 and b/entry/libs/x86_64/libTKFillet.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKG2d.so.7.9 b/entry/libs/x86_64/libTKG2d.so.7.9.3 similarity index 62% rename from entry/libs/x86_64/libTKG2d.so.7.9 rename to entry/libs/x86_64/libTKG2d.so.7.9.3 index 7a00c433..a3cce573 100644 Binary files a/entry/libs/x86_64/libTKG2d.so.7.9 and b/entry/libs/x86_64/libTKG2d.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKG3d.so.7.9 b/entry/libs/x86_64/libTKG3d.so.7.9.3 similarity index 70% rename from entry/libs/x86_64/libTKG3d.so.7.9 rename to entry/libs/x86_64/libTKG3d.so.7.9.3 index 88ef476e..c52c533e 100644 Binary files a/entry/libs/x86_64/libTKG3d.so.7.9 and b/entry/libs/x86_64/libTKG3d.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKGeomAlgo.so.7.9 b/entry/libs/x86_64/libTKGeomAlgo.so.7.9.3 similarity index 79% rename from entry/libs/x86_64/libTKGeomAlgo.so.7.9 rename to entry/libs/x86_64/libTKGeomAlgo.so.7.9.3 index 3ad85ecd..130293bd 100644 Binary files a/entry/libs/x86_64/libTKGeomAlgo.so.7.9 and b/entry/libs/x86_64/libTKGeomAlgo.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKGeomBase.so.7.9 b/entry/libs/x86_64/libTKGeomBase.so.7.9.3 similarity index 84% rename from entry/libs/x86_64/libTKGeomBase.so.7.9 rename to entry/libs/x86_64/libTKGeomBase.so.7.9.3 index 6dc9ebd6..37260bfa 100644 Binary files a/entry/libs/x86_64/libTKGeomBase.so.7.9 and b/entry/libs/x86_64/libTKGeomBase.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKHLR.so.7.9 b/entry/libs/x86_64/libTKHLR.so.7.9.3 similarity index 70% rename from entry/libs/x86_64/libTKHLR.so.7.9 rename to entry/libs/x86_64/libTKHLR.so.7.9.3 index 9dcc002d..b25c357a 100644 Binary files a/entry/libs/x86_64/libTKHLR.so.7.9 and b/entry/libs/x86_64/libTKHLR.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKLCAF.so.7.9 b/entry/libs/x86_64/libTKLCAF.so.7.9.3 similarity index 64% rename from entry/libs/x86_64/libTKLCAF.so.7.9 rename to entry/libs/x86_64/libTKLCAF.so.7.9.3 index 82f76130..440bf9d1 100644 Binary files a/entry/libs/x86_64/libTKLCAF.so.7.9 and b/entry/libs/x86_64/libTKLCAF.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKMath.so.7.9 b/entry/libs/x86_64/libTKMath.so.7.9.3 similarity index 74% rename from entry/libs/x86_64/libTKMath.so.7.9 rename to entry/libs/x86_64/libTKMath.so.7.9.3 index 853cea48..5b94b28d 100644 Binary files a/entry/libs/x86_64/libTKMath.so.7.9 and b/entry/libs/x86_64/libTKMath.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKMesh.so.7.9 b/entry/libs/x86_64/libTKMesh.so.7.9.3 similarity index 63% rename from entry/libs/x86_64/libTKMesh.so.7.9 rename to entry/libs/x86_64/libTKMesh.so.7.9.3 index 5124885a..cea5129b 100644 Binary files a/entry/libs/x86_64/libTKMesh.so.7.9 and b/entry/libs/x86_64/libTKMesh.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKMeshVS.so.7.9 b/entry/libs/x86_64/libTKMeshVS.so.7.9.3 similarity index 64% rename from entry/libs/x86_64/libTKMeshVS.so.7.9 rename to entry/libs/x86_64/libTKMeshVS.so.7.9.3 index 06dc1915..97cc4a93 100644 Binary files a/entry/libs/x86_64/libTKMeshVS.so.7.9 and b/entry/libs/x86_64/libTKMeshVS.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKOffset.so.7.9 b/entry/libs/x86_64/libTKOffset.so.7.9.3 similarity index 78% rename from entry/libs/x86_64/libTKOffset.so.7.9 rename to entry/libs/x86_64/libTKOffset.so.7.9.3 index 22fac426..ddf08b0d 100644 Binary files a/entry/libs/x86_64/libTKOffset.so.7.9 and b/entry/libs/x86_64/libTKOffset.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKOpenGles.so.7.9 b/entry/libs/x86_64/libTKOpenGles.so.7.9.3 similarity index 73% rename from entry/libs/x86_64/libTKOpenGles.so.7.9 rename to entry/libs/x86_64/libTKOpenGles.so.7.9.3 index a9bfa45a..e67563a9 100644 Binary files a/entry/libs/x86_64/libTKOpenGles.so.7.9 and b/entry/libs/x86_64/libTKOpenGles.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKPrim.so.7.9 b/entry/libs/x86_64/libTKPrim.so.7.9.3 similarity index 67% rename from entry/libs/x86_64/libTKPrim.so.7.9 rename to entry/libs/x86_64/libTKPrim.so.7.9.3 index 61191bf9..8fd97f4d 100644 Binary files a/entry/libs/x86_64/libTKPrim.so.7.9 and b/entry/libs/x86_64/libTKPrim.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKRWMesh.so.7.9 b/entry/libs/x86_64/libTKRWMesh.so.7.9.3 similarity index 59% rename from entry/libs/x86_64/libTKRWMesh.so.7.9 rename to entry/libs/x86_64/libTKRWMesh.so.7.9.3 index 5ce47990..9dee1b75 100644 Binary files a/entry/libs/x86_64/libTKRWMesh.so.7.9 and b/entry/libs/x86_64/libTKRWMesh.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKService.so.7.9 b/entry/libs/x86_64/libTKService.so.7.9.3 similarity index 70% rename from entry/libs/x86_64/libTKService.so.7.9 rename to entry/libs/x86_64/libTKService.so.7.9.3 index 4ed7c3c2..16f2b3d0 100644 Binary files a/entry/libs/x86_64/libTKService.so.7.9 and b/entry/libs/x86_64/libTKService.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKShHealing.so.7.9 b/entry/libs/x86_64/libTKShHealing.so.7.9.3 similarity index 79% rename from entry/libs/x86_64/libTKShHealing.so.7.9 rename to entry/libs/x86_64/libTKShHealing.so.7.9.3 index 38fc2955..63180e86 100644 Binary files a/entry/libs/x86_64/libTKShHealing.so.7.9 and b/entry/libs/x86_64/libTKShHealing.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKStd.so.7.9 b/entry/libs/x86_64/libTKStd.so.7.9.3 similarity index 52% rename from entry/libs/x86_64/libTKStd.so.7.9 rename to entry/libs/x86_64/libTKStd.so.7.9.3 index 9f94eed6..f2aab953 100644 Binary files a/entry/libs/x86_64/libTKStd.so.7.9 and b/entry/libs/x86_64/libTKStd.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKStdL.so.7.9 b/entry/libs/x86_64/libTKStdL.so.7.9.3 similarity index 51% rename from entry/libs/x86_64/libTKStdL.so.7.9 rename to entry/libs/x86_64/libTKStdL.so.7.9.3 index 447198ca..ece2be82 100644 Binary files a/entry/libs/x86_64/libTKStdL.so.7.9 and b/entry/libs/x86_64/libTKStdL.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKTObj.so.7.9 b/entry/libs/x86_64/libTKTObj.so.7.9.3 similarity index 62% rename from entry/libs/x86_64/libTKTObj.so.7.9 rename to entry/libs/x86_64/libTKTObj.so.7.9.3 index 62968817..1194029f 100644 Binary files a/entry/libs/x86_64/libTKTObj.so.7.9 and b/entry/libs/x86_64/libTKTObj.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKTopAlgo.so.7.9 b/entry/libs/x86_64/libTKTopAlgo.so.7.9.3 similarity index 76% rename from entry/libs/x86_64/libTKTopAlgo.so.7.9 rename to entry/libs/x86_64/libTKTopAlgo.so.7.9.3 index 349d70bc..a9fc40d1 100644 Binary files a/entry/libs/x86_64/libTKTopAlgo.so.7.9 and b/entry/libs/x86_64/libTKTopAlgo.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKV3d.so.7.9 b/entry/libs/x86_64/libTKV3d.so.7.9.3 similarity index 72% rename from entry/libs/x86_64/libTKV3d.so.7.9 rename to entry/libs/x86_64/libTKV3d.so.7.9.3 index a6063a84..5b319c6b 100644 Binary files a/entry/libs/x86_64/libTKV3d.so.7.9 and b/entry/libs/x86_64/libTKV3d.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKVCAF.so.7.9 b/entry/libs/x86_64/libTKVCAF.so.7.9.3 similarity index 63% rename from entry/libs/x86_64/libTKVCAF.so.7.9 rename to entry/libs/x86_64/libTKVCAF.so.7.9.3 index 4a30cbcf..a76807fd 100644 Binary files a/entry/libs/x86_64/libTKVCAF.so.7.9 and b/entry/libs/x86_64/libTKVCAF.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKXCAF.so.7.9 b/entry/libs/x86_64/libTKXCAF.so.7.9.3 similarity index 67% rename from entry/libs/x86_64/libTKXCAF.so.7.9 rename to entry/libs/x86_64/libTKXCAF.so.7.9.3 index 08b463ca..35b8774f 100644 Binary files a/entry/libs/x86_64/libTKXCAF.so.7.9 and b/entry/libs/x86_64/libTKXCAF.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKXMesh.so.7.9 b/entry/libs/x86_64/libTKXMesh.so.7.9.3 similarity index 78% rename from entry/libs/x86_64/libTKXMesh.so.7.9 rename to entry/libs/x86_64/libTKXMesh.so.7.9.3 index 7d6d7efd..ace70a00 100644 Binary files a/entry/libs/x86_64/libTKXMesh.so.7.9 and b/entry/libs/x86_64/libTKXMesh.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKXSBase.so.7.9 b/entry/libs/x86_64/libTKXSBase.so.7.9.3 similarity index 67% rename from entry/libs/x86_64/libTKXSBase.so.7.9 rename to entry/libs/x86_64/libTKXSBase.so.7.9.3 index d92842ca..28057222 100644 Binary files a/entry/libs/x86_64/libTKXSBase.so.7.9 and b/entry/libs/x86_64/libTKXSBase.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKXml.so.7.9 b/entry/libs/x86_64/libTKXml.so.7.9.3 similarity index 65% rename from entry/libs/x86_64/libTKXml.so.7.9 rename to entry/libs/x86_64/libTKXml.so.7.9.3 index c14adb4d..f3fedfd4 100644 Binary files a/entry/libs/x86_64/libTKXml.so.7.9 and b/entry/libs/x86_64/libTKXml.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKXmlL.so.7.9 b/entry/libs/x86_64/libTKXmlL.so.7.9.3 similarity index 65% rename from entry/libs/x86_64/libTKXmlL.so.7.9 rename to entry/libs/x86_64/libTKXmlL.so.7.9.3 index ff76c491..16d57e49 100644 Binary files a/entry/libs/x86_64/libTKXmlL.so.7.9 and b/entry/libs/x86_64/libTKXmlL.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKXmlTObj.so.7.9 b/entry/libs/x86_64/libTKXmlTObj.so.7.9.3 similarity index 60% rename from entry/libs/x86_64/libTKXmlTObj.so.7.9 rename to entry/libs/x86_64/libTKXmlTObj.so.7.9.3 index 9b0333a9..7b6282ff 100644 Binary files a/entry/libs/x86_64/libTKXmlTObj.so.7.9 and b/entry/libs/x86_64/libTKXmlTObj.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKXmlXCAF.so.7.9 b/entry/libs/x86_64/libTKXmlXCAF.so.7.9.3 similarity index 61% rename from entry/libs/x86_64/libTKXmlXCAF.so.7.9 rename to entry/libs/x86_64/libTKXmlXCAF.so.7.9.3 index 4a6e97bd..89738eda 100644 Binary files a/entry/libs/x86_64/libTKXmlXCAF.so.7.9 and b/entry/libs/x86_64/libTKXmlXCAF.so.7.9.3 differ diff --git a/entry/libs/x86_64/libTKernel.so.7.9 b/entry/libs/x86_64/libTKernel.so.7.9.3 similarity index 77% rename from entry/libs/x86_64/libTKernel.so.7.9 rename to entry/libs/x86_64/libTKernel.so.7.9.3 index 20f8074d..6a7b71ff 100644 Binary files a/entry/libs/x86_64/libTKernel.so.7.9 and b/entry/libs/x86_64/libTKernel.so.7.9.3 differ diff --git a/entry/libs/x86_64/libbrotlicommon.so.1 b/entry/libs/x86_64/libbrotlicommon.so.1.2.0 similarity index 100% rename from entry/libs/x86_64/libbrotlicommon.so.1 rename to entry/libs/x86_64/libbrotlicommon.so.1.2.0 diff --git a/entry/libs/x86_64/libbrotlidec.so.1 b/entry/libs/x86_64/libbrotlidec.so.1.2.0 similarity index 100% rename from entry/libs/x86_64/libbrotlidec.so.1 rename to entry/libs/x86_64/libbrotlidec.so.1.2.0 diff --git a/entry/libs/x86_64/libbrotlienc.so.1 b/entry/libs/x86_64/libbrotlienc.so.1.2.0 similarity index 100% rename from entry/libs/x86_64/libbrotlienc.so.1 rename to entry/libs/x86_64/libbrotlienc.so.1.2.0 diff --git a/entry/libs/x86_64/libbz2.so.1.0 b/entry/libs/x86_64/libbz2.so.1.0.8 similarity index 100% rename from entry/libs/x86_64/libbz2.so.1.0 rename to entry/libs/x86_64/libbz2.so.1.0.8 diff --git a/entry/libs/x86_64/libexpat.so.1 b/entry/libs/x86_64/libexpat.so.1.11.2 similarity index 100% rename from entry/libs/x86_64/libexpat.so.1 rename to entry/libs/x86_64/libexpat.so.1.11.2 diff --git a/entry/libs/x86_64/libfontconfig.so.1 b/entry/libs/x86_64/libfontconfig.so.1.16.0 similarity index 99% rename from entry/libs/x86_64/libfontconfig.so.1 rename to entry/libs/x86_64/libfontconfig.so.1.16.0 index 1dd9e6d1..0480535d 100644 Binary files a/entry/libs/x86_64/libfontconfig.so.1 and b/entry/libs/x86_64/libfontconfig.so.1.16.0 differ diff --git a/entry/libs/x86_64/libfreetype.so.6 b/entry/libs/x86_64/libfreetype.so.6.20.2 similarity index 100% rename from entry/libs/x86_64/libfreetype.so.6 rename to entry/libs/x86_64/libfreetype.so.6.20.2 diff --git a/entry/libs/x86_64/libpng16.so.16 b/entry/libs/x86_64/libpng16.so.16.54.0 similarity index 100% rename from entry/libs/x86_64/libpng16.so.16 rename to entry/libs/x86_64/libpng16.so.16.54.0 diff --git a/entry/libs/x86_64/libz.so.1 b/entry/libs/x86_64/libz.so similarity index 100% rename from entry/libs/x86_64/libz.so.1 rename to entry/libs/x86_64/libz.so diff --git a/entry/libs/x86_64/libz.so.1.3.1 b/entry/libs/x86_64/libz.so.1.3.1 new file mode 100644 index 00000000..190094a9 Binary files /dev/null and b/entry/libs/x86_64/libz.so.1.3.1 differ diff --git a/entry/src/main/cpp/CMakeLists.txt b/entry/src/main/cpp/CMakeLists.txt index c54e596e..22a3e59f 100644 --- a/entry/src/main/cpp/CMakeLists.txt +++ b/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}) +